调整

shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java

@@ -93,6 +93,9 @@ public class BuyOrderController extends AbstractController {
 		}
 		model.addAttribute("orders", orders);
 		this.initUser(model);
+		
+		System.out.println(JSON.toJSONString(orders));
+		
 		return "/query_reportv2";
 	}
 	

shop/src/main/java/com/zskk/shop/service/TJCenterService.java

@@ -111,6 +111,8 @@ public class TJCenterService {
 		data.put("extend", extend);
 		data.put("callback_url", myhost + "tj/callback");
 		
+		System.out.println(JSON.toJSONString(data));
+		
 		String url = tjcenter + "public/api.php/shop/addSubscribe";
 		String content = this.doPost(url, data);
 		JSONObject obj = JSON.parseObject(content);

shop/src/main/resource/templates/h5/mypayedorders.html

@@ -30,8 +30,12 @@
                     <a th:if="${item.fa != null and item.fa.tjstatus eq -2}" href="#" class="btnBlue" >已取消</a>
                     <a th:if="${item.fa != null and item.fa.tjstatus eq -1}" th:attr="href='/h5/appointment/gochangeappointment/'+${item.fa.aid}" class="btnBlue" >改约</a>
                     <a th:if="${item.fa != null and item.fa.tjstatus eq 0}" href="#" class="btnBlue" >已登记</a>
-                    <a th:if="${item.fa != null and item.fa.tjstatus eq 1}" href="#" class="btnBlue" >体检结束(报告生成中)</a>
+                    <a th:if="${item.fa != null and item.fa.tjstatus eq 1}" href="#" class="btnBlue" >报告生成中</a>
+                    <a th:if="${item.fa != null and item.fa.tjstatus eq 4}" href="#" class="btnBlue" >报告生成中</a>
+                    <a th:if="${item.fa != null and item.fa.tjstatus eq 5}" href="#" class="btnBlue" >报告生成中</a>
+                    <a th:if="${item.fa != null and item.fa.tjstatus eq 7}" href="#" class="btnBlue" >报告生成中</a>
                     <a th:if="${item.fa != null and item.fa.tjstatus eq 2}" th:attr="href=${item.fa.reportUrl}" class="btnBlue" target="_blank" >查看报告</a>
+					<a th:if="${item.fa != null and item.fa.tjstatus eq 6}" th:attr="href=${item.fa.reportUrl}" class="btnBlue" target="_blank" >查看报告</a>
 				</p>
 				<p th:if="${order.payStatus} eq 0">
 					<a class="cancel" th:attr="href='javascript:delOrder(' + ${order.id} + ')'" >取消订单</a>

shop/src/main/resource/templates/h5/query_report.html

@@ -24,10 +24,20 @@
 					</div>
 				</a>
 				<p>
-					<a th:if="${order.status eq -1}" href="#" class="btn-blue y" >已预约</a>
-                    <a th:if="${order.status eq 0}" href="#" class="btn-blue y" >已签到</a>
-                    <a th:if="${order.status eq 1}" href="#" class="btn-blue y" >体检结束(报告生成中)</a>
-                    <a th:if="${order.status eq 2}" th:attr="href='http://kunlun.pacsonline.cn/public/api.php/shop/reportDetails?id=' + ${order.id}" class="btn-blue y" target="_blank" >查看报告</a>
+					<a th:if="${order.status eq -1}" href="#" class="btn-blue y">已预约</a>
+					<a th:if="${order.status eq -99}" href="#" class="btn-blue y">已删除</a>
+					<a th:if="${order.status eq 0}" href="#" class="btn-blue y">已签到</a>
+					<a th:if="${order.status eq 1}" href="#" class="btn-blue y">报告生成中</a>
+					<a th:if="${order.status eq 4}" href="#" class="btn-blue y">报告生成中</a>
+					<a th:if="${order.status eq 5}" href="#" class="btn-blue y">报告生成中</a>
+					<a th:if="${order.status eq 7}" href="#" class="btn-blue y">报告生成中</a>
+
+					<a th:if="${order.status eq 2}"
+						th:attr="href='http://kunlun.pacsonline.cn/public/api.php/shop/reportDetails?id=' + ${order.id}"
+						class="btn-blue y" target="_blank">查看报告</a> 
+					<a th:if="${order.status eq 6}"
+						th:attr="href='http://kunlun.pacsonline.cn/public/api.php/shop/reportDetails?id=' + ${order.id}"
+						class="btn-blue y" target="_blank">查看报告</a>
 				</p>
 			</div>
 		</div>

shop/src/main/resource/templates/mypayedorders.html

@@ -54,8 +54,12 @@
                             	<a th:if="${item.fa != null and item.fa.tjstatus eq -2}" href="#" class="btn-blue y" >已取消</a>
                             	<a th:if="${item.fa != null and item.fa.tjstatus eq -1}" th:attr="href='/appointment/gochangeappointment/'+${item.fa.aid}" class="btn-blue y" >改约</a>
                             	<a th:if="${item.fa != null and item.fa.tjstatus eq 0}" href="#" class="btn-blue y" >已登记</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 1}" href="#" class="btn-blue y" >体检结束(报告生成中)</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 1}" href="#" class="btn-blue y" >报告生成中</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 4}" href="#" class="btn-blue y" >报告生成中</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 5}" href="#" class="btn-blue y" >报告生成中</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 7}" href="#" class="btn-blue y" >报告生成中</a>
                             	<a th:if="${item.fa != null and item.fa.tjstatus eq 2}" th:attr="href=${item.fa.reportUrl}" class="btn-blue y" target="_blank" >查看报告</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 6}" th:attr="href=${item.fa.reportUrl}" class="btn-blue y" target="_blank" >查看报告</a>
                             </td>
                         </tr>
                     </tbody>

shop/src/main/resource/templates/query_report.html

@@ -54,8 +54,12 @@
                             	<a th:if="${item.fa != null and item.fa.tjstatus eq -2}" href="#" class="btn-blue y" >已取消</a>
                             	<a th:if="${item.fa != null and item.fa.tjstatus eq -1}" th:attr="href='/appointment/gochangeappointment/'+${item.fa.aid}" class="btn-blue y" >改约</a>
                             	<a th:if="${item.fa != null and item.fa.tjstatus eq 0}" href="#" class="btn-blue y" >已登记</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 1}" href="#" class="btn-blue y" >体检结束(报告生成中)</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 1}" href="#" class="btn-blue y" >报告生成中</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 4}" href="#" class="btn-blue y" >报告生成中</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 5}" href="#" class="btn-blue y" >报告生成中</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 7}" href="#" class="btn-blue y" >报告生成中</a>
                             	<a th:if="${item.fa != null and item.fa.tjstatus eq 2}" th:attr="href=${item.fa.reportUrl}" class="btn-blue y" target="_blank" >查看报告</a>
+                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 6}" th:attr="href=${item.fa.reportUrl}" class="btn-blue y" target="_blank" >查看报告</a>
                             </td>
                         </tr>
                     </tbody>

shop/src/main/resource/templates/query_reportv2.html

@@ -48,9 +48,15 @@
                             		<div class="cBlue mt10" >体检人：<span th:text="${order.role_name}"></span> 体检日期：<span th:text="${order.signtime}"></span></div>
                             	</div>
                             	<a th:if="${order.status eq -1}" href="#" class="btn-blue y" >已预约</a>
+                            	<a th:if="${order.status eq -99}" href="#" class="btn-blue y" >已删除</a>
                             	<a th:if="${order.status eq 0}" href="#" class="btn-blue y" >已签到</a>
-                            	<a th:if="${order.status eq 1}" href="#" class="btn-blue y" >体检结束(报告生成中)</a>
+                            	<a th:if="${order.status eq 1}" href="#" class="btn-blue y" >报告生成中</a>
+                            	<a th:if="${order.status eq 4}" href="#" class="btn-blue y" >报告生成中</a>
+                            	<a th:if="${order.status eq 5}" href="#" class="btn-blue y" >报告生成中</a>
+                            	<a th:if="${order.status eq 7}" href="#" class="btn-blue y" >报告生成中</a>
+                            	
                             	<a th:if="${order.status eq 2}" th:attr="href='http://kunlun.pacsonline.cn/public/api.php/shop/reportDetails?id=' + ${order.id}" class="btn-blue y" target="_blank" >查看报告</a>
+                            	<a th:if="${order.status eq 6}" th:attr="href='http://kunlun.pacsonline.cn/public/api.php/shop/reportDetails?id=' + ${order.id}" class="btn-blue y" target="_blank" >查看报告</a>
                             </td>
                         </tr>
                     </tbody>