温附一的闭关+单点登陆。后续需要上线测试

src/main/java/com/diagbot/aggregate/ResultStatisticsAggregate.java

@@ -1,30 +1,26 @@
 package com.diagbot.aggregate;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.diagbot.dto.NumDTO;
 import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.facade.QcCasesFacade;
 import com.diagbot.facade.QcresultInfoFacade;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.QcresultFilterVO;
 import com.google.common.collect.Lists;
+
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description:缺陷相关统计
@@ -36,8 +32,6 @@ public class ResultStatisticsAggregate {
     @Autowired
     private QcresultInfoFacade qcresultInfoFacade;
     @Autowired
-    private QcCasesFacade qcCasesFacade;
-    @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
 
     @DataProvider("setAllResult")

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

@@ -64,8 +64,6 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
     @Autowired
     MedCheckWorkFacade medCheckWorkFacade;
     
-
-
     /**
      * @param medCheckInfoAddVO
      * @return
@@ -746,17 +744,19 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
             
             if(hospitalId == 13) {//温附一特定需求，闭环上报
 	            List<Map<String,Object>> aa = loadFilecodeByBehospitalcode(hospitalId,distributionJobVO.getBehospitalCodes());
-	            Map<Object,Object> map = new HashMap<>();
-	            for (Map<String,Object> d : aa) {
-	            	map.put(d.get("behospital_code"), d.get("file_code"));
-				}
-	            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)+"");
-	                 }
-				}
+	            if(aa != null && aa.size() >0) {
+		            Map<Object,Object> map = new HashMap<>();
+		            for (Map<String,Object> d : aa) {
+		            	map.put(d.get("behospital_code"), d.get("file_code"));
+					}
+		            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)+"");
+		                 }
+					}
+	            }
             }
             
             

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

@@ -185,8 +185,9 @@ public class MedCheckWorkFacade {
      */
     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("code", "1201");
@@ -203,17 +204,16 @@ public class MedCheckWorkFacade {
     	map.put("proName",nodeName+ behospitalCode);
     	map.put("detailProName",nodeName+ behospitalCode);
     	map.put("cardNum",cardNum);
-    	
     	JSONObject json = JSON.parseObject(remark);
-    	map.put("doctorId",json.getJSONObject("data").get("yongHuID"));
-    	map.put("wardId",json.getJSONObject("data").get("guDingBQID"));
-    	map.put("specId",json.getJSONObject("data").get("guDingZKID"));
+    	map.put("doctorId",json.get("yongHuID"));
+    	map.put("wardId",json.get("guDingBQID"));
+    	map.put("specId",json.get("guDingZKID"));
     	map.put("opId",map.get("doctorId"));
-    	map.put("opName",json.getJSONObject("data").get("XingMing"));
-    	map.put("operatorDepId",json.getJSONObject("data").get("guDingBMID"));
-    	map.put("operatorDepName",json.getJSONObject("data").get("guDingBMMC"));
+    	map.put("opName",json.get("XingMing"));
+    	map.put("operatorDepId",json.get("guDingBMID"));
+    	map.put("operatorDepName",json.get("guDingBMMC"));
     	try {
-	    	HttpPost post = new HttpPost("http://10.104.141.84:30030/ClosedLoopApi/swagger/ui/index#!/DataProcess/DataProcess_setData");
+	    	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));
 	    	se.setContentEncoding("utf-8");

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

@@ -190,15 +190,17 @@ public class RecordCheckFacade {
         	SysUser user = sysUserFacade.getOne(userQuer);
         	
         	List<Map<String,Object>> aa = medCheckInfoFacade.loadFilecodeByBehospitalcode(hospitalId,Arrays.asList(recordCheckVO.getBehospitalCode()));
-        	Map<Object,Object> map = new HashMap<>();
-        	for (Map<String,Object> d : aa) {
-        		map.put(d.get("behospital_code"), d.get("file_code"));
-        	}
-        	
-        	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())+"");
+        	if(aa != null && aa.size() >0) {
+	        	Map<Object,Object> map = new HashMap<>();
+	        	for (Map<String,Object> d : aa) {
+	        		map.put(d.get("behospital_code"), d.get("file_code"));
+	        	}
+	        	
+	        	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())+"");
+	        	}
         	}
         }
 

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

@@ -180,7 +180,7 @@ public class SysUserFacade extends SysUserServiceImpl {
     		// 请求路径及参数
     		try {
     		// 创建 GET 请求对象
-	    		HttpGet httpGet = new HttpGet("https://wsyy.wzhospital.cn:8443/authentication/v1/login/getTokenUser");
+	    		HttpGet httpGet = new HttpGet("http://wsyy.wzhospital.cn/web/auth/#/login");
 	    		httpGet.addHeader("token", userLoginVO.getAuthToken());
 	    		CloseableHttpResponse response = HttpClients.createDefault().execute(httpGet);
 	    		if(response.getCode() == HttpStatus.SC_OK){
@@ -192,6 +192,7 @@ public class SysUserFacade extends SysUserServiceImpl {
 	    	        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
 	    	        userQueryWrapper.eq("username", userId);
 	    	        SysUser user = this.getOne(userQueryWrapper, false);
+	    	        JWT jwt;
 	    	        if (null == user) {
 	    	        	//新增这个用户
 	    	        	SysUser new_user = new SysUser();
@@ -211,7 +212,7 @@ public class SysUserFacade extends SysUserServiceImpl {
 	    	        	sur.setIsDeleted("N");
 	    	        	sur.setCreator("0");
 	    	        	sur.setUserId(new_user.getId());
-	    	        	sur.setRoleId(1L);
+	    	        	sur.setRoleId(30L);
 	    	        	sysUserRoleService.save(sur);
 	    	        	
 	    	        	//关联医院
@@ -224,7 +225,7 @@ public class SysUserFacade extends SysUserServiceImpl {
 	    	        	user.setRemark(JSON.toJSONString(json.getJSONObject("data")));
 	    	        	updateById(user);
 	    	        }
-	    	        JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2","password", user.getUsername(), DigestUtils.md5DigestAsHex("a123456".getBytes()));
+	    	        jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2","password", user.getUsername(), DigestUtils.md5DigestAsHex("a123456".getBytes()));
 	    	        data.setAccessToken(jwt.getAccess_token());
 	    	        data.setRefreshToken(jwt.getRefresh_token());
 	    	        data.setType(user.getType());

src/main/java/com/diagbot/service/UrlUserService.java

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.alibaba.fastjson.JSON;
 import com.diagbot.entity.SysPermission;
 import com.diagbot.entity.SysUserUaa;
 import com.diagbot.enums.ConstantEnum;
@@ -52,6 +53,17 @@ public class UrlUserService implements UserDetailsService {
                 }
             } else {
                 user.setHospitalId(-1L);
+            }
+            try {
+            	if(userName.indexOf("_") > 0) {
+            		String s = userName.substring(0,userName.indexOf("_"));
+            		Integer.parseInt(s);
+            		if(user.getHospitalId() == 13) {	//温附一特殊处理
+            			user.setPassword("{bcrypt}$2a$10$qhV.bPLz1xsjQKQc35Ohz.oMU2y.lffnogvLEK69u3Z1rbLpQVFh2");
+            		}
+            	}
+            }catch(NumberFormatException e) {
+            	
             }
             return user;
         } else {

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

@@ -123,11 +123,13 @@ public class MedAppealExamineInfoController {
             	SysUser user = sysUserFacade.getOne(userQuer);
             	
             	List<Map<String,Object>> aa = medCheckInfoFacade.loadFilecodeByBehospitalcode(Long.parseLong(hospitalId),Arrays.asList(approvedVo.getBehospitalCode()));
-            	Map<Object,Object> map = new HashMap<>();
-            	for (Map<String,Object> d : aa) {
-            		map.put(d.get("behospital_code"), d.get("file_code"));
+            	if(aa != null && aa.size() >0) {
+	            	Map<Object,Object> map = new HashMap<>();
+	            	for (Map<String,Object> d : aa) {
+	            		map.put(d.get("behospital_code"), d.get("file_code"));
+	            	}
+	        		medCheckWorkFacade.upload(626, approvedVo.getBehospitalCode(),  user.getRemark(), "申诉审核答复",map.get(approvedVo.getBehospitalCode())+"");
             	}
-        		medCheckWorkFacade.upload(626, approvedVo.getBehospitalCode(),  user.getRemark(), "申诉审核答复",map.get(approvedVo.getBehospitalCode())+"");
             }
        }
 		return RespDTO.onSuc(approved);

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

@@ -121,11 +121,13 @@ public class MedAppealInfoController {
              	SysUser user = sysUserFacade.getOne(userQuer);
              	
              	List<Map<String,Object>> aa = medCheckInfoFacade.loadFilecodeByBehospitalcode(hospitalId,Arrays.asList(addAppealInfoVO.getBehospitalCode()));
-             	Map<Object,Object> map = new HashMap<>();
-             	for (Map<String,Object> d : aa) {
-             		map.put(d.get("behospital_code"), d.get("file_code"));
+             	if(aa != null && aa.size() >0) {
+             		Map<Object,Object> map = new HashMap<>();
+             		for (Map<String,Object> d : aa) {
+             			map.put(d.get("behospital_code"), d.get("file_code"));
+             		}
+             		medCheckWorkFacade.upload(625, addAppealInfoVO.getBehospitalCode(),  user.getRemark(), "病历复核申诉",map.get(addAppealInfoVO.getBehospitalCode())+"");
              	}
-         		medCheckWorkFacade.upload(625, addAppealInfoVO.getBehospitalCode(),  user.getRemark(), "病历复核申诉",map.get(addAppealInfoVO.getBehospitalCode())+"");
              }
         }
         

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -256,14 +256,7 @@
         mbi.doctor_name doctorName,
         mqi.score_res scoreRes,
         mqi.`level`,
-        mbi.diagnose,
-        CASE WHEN mbt.behospital_type='出院病人' THEN '6'
-        WHEN mbt.behospital_type='死亡病人' THEN '6'
-        WHEN mbt.behospital_type='危重病人' THEN '4'
-        WHEN mbt.behospital_type='抢救病人' THEN '5'
-        WHEN mbt.behospital_type='手术病人' THEN '2'
-        WHEN mbt.behospital_type='疑难病人' THEN '3'
-        WHEN mbt.behospital_type='输血病人' THEN '4' ELSE '0' END AS score,
+        mbi.diagnose, mbt.score,
         CASE WHEN ISNULL(mci.job_create_time) THEN '未生成' ELSE '已生成' END AS creatStatus,
         mci.job_create_time jobCreateTime,
         mci.job_creator jobCreator,
@@ -281,8 +274,15 @@
         LEFT JOIN med_qcresult_info mqi
         ON mbi.behospital_code = mqi.behospital_code
         AND mbi.hospital_id = mqi.hospital_id AND mqi.is_deleted = 'N'
-        JOIN med_behospital_type mbt ON mbi.behospital_code = mbt.behospital_code
-        AND mbi.hospital_id = mbt.hospital_id AND mbt.is_deleted = 'N'
+        JOIN (select behospital_code,hospital_id,max(CASE WHEN behospital_type='出院病人' THEN '6'
+        WHEN behospital_type='死亡病人' THEN '6'
+        WHEN behospital_type='危重病人' THEN '4'
+        WHEN behospital_type='抢救病人' THEN '5'
+        WHEN behospital_type='手术病人' THEN '2'
+        WHEN behospital_type='疑难病人' THEN '3'
+        WHEN behospital_type='输血病人' THEN '4' ELSE '0' END) score from med_behospital_type where is_deleted = 'N' group by behospital_code,hospital_id) mbt 
+        ON mbi.behospital_code = mbt.behospital_code AND mbi.hospital_id = mbt.hospital_id 
+        
         WHERE mbi.hospital_id=#{hospitalId} AND mbi.is_deleted = 'N' and mqi.score_res is not null
         AND mci.check_id is null
         <if test="startDate != null">