温附一单点登陆+闭环上报

src/main/java/com/diagbot/facade/MedCheckInfoFacade.java

@@ -751,9 +751,9 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
 					}
 		            for (String behospitalCode : distributionJobVO.getBehospitalCodes()) {
 		            	 if("0".equals(distributionJobVO.getJobType())) {
-		                 	medCheckWorkFacade.upload(618, behospitalCode,  user.getRemark(), "分配核查任务（科级）",map.get(behospitalCode)+"");
-		                 }else if("1".equals(distributionJobVO.getJobType())) {
-		                	 medCheckWorkFacade.upload(622, behospitalCode,  user.getRemark(), "分配核查任务（院级）",map.get(behospitalCode)+"");
+		                 	medCheckWorkFacade.upload(618, behospitalCode,  user.getRemark(), "分配核查任务(科级)",map.get(behospitalCode)+"");
+		                 }else if("2".equals(distributionJobVO.getJobType())) {
+		                	 medCheckWorkFacade.upload(622, behospitalCode,  user.getRemark(), "分配核查任务(院级)",map.get(behospitalCode)+"");
 		                 }
 					}
 	            }

src/main/java/com/diagbot/facade/MedCheckWorkFacade.java

@@ -159,12 +159,12 @@ public class MedCheckWorkFacade {
                 medCheckInfo.setJobCreateTime(now);
                 medCheckInfo.setJobType(medCheckWorkVO.getJobType());
                 medCheckInfoList.add(medCheckInfo);
-                
+                 
                 if(hospitalId == 13) {//温附一特定需求，闭环上报
 	                if(medCheckWorkVO.getJobType() == 0) {
-	                	upload(617, behospitalCode,  user.getRemark(), "分配核查任务（科级）",map.get(behospitalCode)+"");
-	                }else if(medCheckWorkVO.getJobType() == 1) {
-	                	upload(621, behospitalCode,  user.getRemark(), "分配核查任务（院级）",map.get(behospitalCode)+"");
+	                	upload(617, behospitalCode,  user.getRemark(), "生成核查任务(科级)",map.get(behospitalCode)+"");
+	                }else if(medCheckWorkVO.getJobType() == 2) {
+	                	upload(621, behospitalCode,  user.getRemark(), "生成核查任务(院级)",map.get(behospitalCode)+"");
 	                }
                 }
             }
@@ -172,7 +172,6 @@ public class MedCheckWorkFacade {
         }
         return flag;
     }
-
     
     //温州附一个性化闭环改造
     /**
@@ -184,18 +183,16 @@ public class MedCheckWorkFacade {
      * @param cardNum			病案号
      */
     public void upload(int nodeId,String behospitalCode,String remark,String nodeName,String cardNum) {
-    	
     	if(StringUtil.isBlank(remark)) {	//没有登陆信息， 不上报
     		return;
     	}
-    	
     	Map<String,Object> map = new HashMap<>();
+    	map.put("frontProTabName", "");
+    	map.put("frontProTabKey", "");	//病人住院序号
     	map.put("code", "1201");
     	map.put("tabName", "e_zyblbr");
-    	map.put("frontProTabName", "e_zyblbr");
     	map.put("appCode", "020");
     	map.put("tabKey", behospitalCode);			//病人住院序号
-    	map.put("frontProTabKey", behospitalCode);	//病人住院序号
     	map.put("medrecId", behospitalCode);		//病人住院序号
     	map.put("closedLoopKey", behospitalCode);	//病人住院序号
     	map.put("nodeId", nodeId);					//闭环节点
@@ -215,13 +212,18 @@ public class MedCheckWorkFacade {
     	try {
 	    	HttpPost post = new HttpPost("http://172.16.201.167/ClosedLoopApi/api/DataProcess/setData");
 	    	post.setHeader("Content-Type", "application/json;charset=UTF-8");
-	    	StringEntity se = new StringEntity(JSON.toJSONString(map));
+	    	String jsonString = JSON.toJSONString(map);
+			StringEntity se = new StringEntity(jsonString,"utf-8");
 	    	se.setContentEncoding("utf-8");
 	    	se.setContentType("application/json");
 	    	post.setEntity(se);
 	    	CloseableHttpResponse execute = HttpClients.createDefault().execute(post);
-	    	if(execute.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
-	    		log.info("上报数据成功,上报的信息为：{};\t结果信息为:{}",JSON.toJSONString(map),EntityUtils.toString(execute.getEntity()));
+	    	int statusCode = execute.getStatusLine().getStatusCode();
+	    	String string = EntityUtils.toString(execute.getEntity());
+	    	System.out.println("上报结果是:"+statusCode);
+	    	System.out.println("上报数据成功,上报的信息为："+jsonString+";\t结果信息为:"+string);
+			if(statusCode == HttpStatus.SC_OK) {
+	    		log.info("上报数据成功,上报的信息为：{};\t结果信息为:{}",jsonString,string);
 	    	}
     	}catch(Exception e) {
     		log.error("数据上报出现异常",e);

src/main/java/com/diagbot/facade/QcresultInfoFacade.java

@@ -135,9 +135,9 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
              MedCheckInfo medCheckInfo = medCheckInfoFacade.getOne(medCheckInfoQueryWrapper);
         	
         	if(medCheckInfo.getJobType() == 0 ) {
-        		medCheckWorkFacade.upload(619, qcresultVO.getBehospitalCode(),  user.getRemark(), "人工核查（科级）",map.get(qcresultVO.getBehospitalCode())+"");
-        	}else if(medCheckInfo.getJobType() == 1 ) {
-        		medCheckWorkFacade.upload(623, qcresultVO.getBehospitalCode(),  user.getRemark(), "人工核查（院级）",map.get(qcresultVO.getBehospitalCode())+"");
+        		medCheckWorkFacade.upload(619, qcresultVO.getBehospitalCode(),  user.getRemark(), "人工核查(科级)",map.get(qcresultVO.getBehospitalCode())+"");
+        	}else if(medCheckInfo.getJobType() == 2 ) {
+        		medCheckWorkFacade.upload(623, qcresultVO.getBehospitalCode(),  user.getRemark(), "人工核查(院级)",map.get(qcresultVO.getBehospitalCode())+"");
         	}
         }
         

src/main/java/com/diagbot/facade/RecordCheckFacade.java

@@ -197,9 +197,9 @@ public class RecordCheckFacade {
 	        	}
 	        	
 	        	if(medCheckInfo.getJobType() == 0 ) {
-	        		medCheckWorkFacade.upload(620, recordCheckVO.getBehospitalCode(),  user.getRemark(), "质控完成（科级）",map.get(recordCheckVO.getBehospitalCode())+"");
-	        	}else if(medCheckInfo.getJobType() == 1 ) {
-	        		medCheckWorkFacade.upload(624, recordCheckVO.getBehospitalCode(),  user.getRemark(), "质控完成（院级）",map.get(recordCheckVO.getBehospitalCode())+"");
+	        		medCheckWorkFacade.upload(620, recordCheckVO.getBehospitalCode(),  user.getRemark(), "质控完成(科级)",map.get(recordCheckVO.getBehospitalCode())+"");
+	        	}else if(medCheckInfo.getJobType() == 2) {
+	        		medCheckWorkFacade.upload(624, recordCheckVO.getBehospitalCode(),  user.getRemark(), "质控完成(院级)",map.get(recordCheckVO.getBehospitalCode())+"");
 	        	}
         	}
         }

src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
@@ -180,11 +180,14 @@ public class SysUserFacade extends SysUserServiceImpl {
     		// 请求路径及参数
     		try {
     		// 创建 GET 请求对象
-	    		HttpGet httpGet = new HttpGet("http://wsyy.wzhospital.cn/web/auth/#/login");
+	    		HttpPost httpGet = new HttpPost("https://wsyy.wzhospital.cn:8443/app-thirdplatform/v1/user/getUserById");
 	    		httpGet.addHeader("token", userLoginVO.getAuthToken());
+	    		System.out.println(userLoginVO.getAuthToken());
 	    		CloseableHttpResponse response = HttpClients.createDefault().execute(httpGet);
-	    		if(response.getCode() == HttpStatus.SC_OK){
-	    			String result = EntityUtils.toString(response.getEntity());
+	    		System.out.println(response.getCode());
+    			String result = EntityUtils.toString(response.getEntity());
+    			System.out.println(result);
+    			if(response.getCode() == HttpStatus.SC_OK){
 	    			JSONObject json = JSON.parseObject(result);
 	    			
 	    			String userId = json.getJSONObject("data").getInteger("yongHuID")+"_"+json.getJSONObject("data").getString("xingMing");

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -405,7 +405,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 //由于温附一入院记录多份，不能按照上面的单份逻辑，要在文书循环赋值mode_id后，
                 // 再判断文书中是否存在24小时入出院记录，有则将qc_type_id赋值为0（不知空）
                 for (MedicalRecord medicalRecord : medicalRecordList) {
-                    if (medicalRecord.getRecTitle().contains("24小时")) {
+                    if (medicalRecord.getRecTitle().contains("24小时") && behospitalInfoList.size() >0) {
                         BehospitalInfo behospitalInfo = behospitalInfoList.get(0);
                         behospitalInfo.setQcTypeId(Long.valueOf(0));
                         behospitalInfoList.clear();

src/main/java/com/diagbot/web/MedAppealInfoController.java

@@ -133,7 +133,6 @@ public class MedAppealInfoController {
         
 		return addAppealInfo;
     }
-
     
     
     @ApiOperation(value = "获取审核人-对外api接口[by:songxl]",notes = "获取审核人")

src/main/resources/application-pro.yml

@@ -83,7 +83,7 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
+      filters.commons-log.connection-logger-name: wall
       filter:
         stat:
           enabled: true
@@ -169,7 +169,7 @@ encrypt:
   enable: false
 
 swagger:
-  enable: true
+  enable: false
 
 #xml解析成结构化开关
 xml_analyse:

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: test
+    active: pro
   main:
     allow-bean-definition-overriding: true
 

src/main/resources/logback-spring.xml

@@ -205,13 +205,13 @@
     <logger name="org.springframework" level="WARN"/>
 
     <!-- mybatis日志打印-->
-    <logger name="org.apache.ibatis" level="DEBUG"/>
-    <logger name="java.sql" level="DEBUG"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
+    <logger name="java.sql" level="INFO"/>
 
     <!--  项目 mapper 路径
             console控制台显示sql语句：STDOUT.filter.level -> debug级别
     -->
-    <logger name="com.diagbot.mapper" level="DEBUG"/>
+    <logger name="com.diagbot.mapper" level="INFO"/>
 
     <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>