图标和PC版的体检报告

shop/src/main/java/com/zskk/shop/controller/api/ApiController.java

@@ -118,6 +118,13 @@ public class ApiController {
 		return htmlContent;
 	}
 	
+	@RequestMapping("pcrjreport/{id}")
+	@ResponseBody
+	public String pcrjreport(@PathVariable("id") String id){
+		String htmlContent = tJCenterService.getPcTjReport(id);
+		return htmlContent;
+	}
+	
 	@RequestMapping("sendCode/{phone}")
 	@ResponseBody
 	public ControllerResult sendCode(@PathVariable("phone") String phone){

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

@@ -71,6 +71,16 @@ public class TJCenterService {
 		String content = this.doPost(url, data);
 		return content;
 	}
+	
+	public String getPcTjReport(String id){
+		String url = tjcenter + "/public/shop/shop/getOfficialTotalResult";
+		Map<String, Object> data = new HashMap<>();
+		data.put("id", id);
+		data.put("outer_key", "tj");
+		
+		String content = this.doPost(url, data);
+		return content;
+	}
 
 	/**
 	 * 获取详细

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

@@ -56,8 +56,8 @@
                             	<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='/api/rjreport/' + ${order.id}" class="btn-blue y" target="_blank" >查看报告</a>
-                            	<a th:if="${order.status eq 6}" th:attr="href='/api/rjreport/' + ${order.id}" class="btn-blue y" target="_blank" >查看报告</a>
+                            	<a th:if="${order.status eq 2}" th:attr="href='/api/pcrjreport/' + ${order.id}" class="btn-blue y" target="_blank" >查看报告</a>
+                            	<a th:if="${order.status eq 6}" th:attr="href='/api/pcrjreport/' + ${order.id}" class="btn-blue y" target="_blank" >查看报告</a>
                             </td>
                         </tr>
                     </tbody>

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

@@ -5,6 +5,8 @@
 <title>黑龙江昆仑盛和安体检中心</title>
 <link rel="stylesheet" type="text/css" href="/style/common.css" />
 <link rel="stylesheet" type="text/css" href="/style/shop.css" />
+<link rel="icon" href="/images/favicon.ico" type="image/x-icon"/>
+
 <!--[if lt IE 9]> 
 <script src="http://css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script> 
 <![endif]-->