浏览代码

增加单点登录和闭环上报

尚正平 2 年之前
父节点
当前提交
301ae0afb1

+ 9 - 9
src/main/java/com/diagbot/config/AuthenticationExceptionHandler.java

@@ -1,9 +1,13 @@
 package com.diagbot.config;
 
 
-import com.diagbot.facade.SysUserFacade;
-import com.diagbot.util.StringUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.authentication.AccountStatusException;
@@ -15,13 +19,9 @@ import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.stereotype.Component;
-import org.springframework.validation.BindException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+import com.diagbot.facade.SysUserFacade;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * @Description:权限认证异常处理

+ 4 - 4
src/main/java/com/diagbot/entity/MedCheckInfo.java

@@ -1,12 +1,12 @@
 package com.diagbot.entity;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
+import lombok.Data;
 
 /**
  * <p>

+ 43 - 36
src/main/java/com/diagbot/facade/MedCheckInfoFacade.java

@@ -1,5 +1,17 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,17 +40,6 @@ import com.diagbot.vo.CheckUserVO;
 import com.diagbot.vo.DistributionJobVO;
 import com.diagbot.vo.MedCheckInfoAddVO;
 import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -60,6 +61,9 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
     BasDoctorInfoFacade basDoctorInfoFacade;
     @Autowired
     BasDeptInfoFacade basDeptInfoFacade;
+    @Autowired
+    MedCheckWorkFacade medCheckWorkFacade;
+    
 
 
     /**
@@ -195,11 +199,11 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "科室质管科不存在,请联系管理员!");
             }
             //2.获取监管人员所在科室集合
-            List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", hospitalId)
-                    .eq("user_id", principleId)
-            ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
+//            List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
+//                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                    .eq("hospital_id", hospitalId)
+//                    .eq("user_id", principleId)
+//            ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
             //3.判断这个人是否在质控科
 //            if(deptIds.contains(zkkDeptId))
 //            {
@@ -230,25 +234,6 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
                 }
                 //院区获取
                 if (CheckJobTypeEnum.HOSP_SUPERVISOR.getKey() == Integer.parseInt(checkJobVO.getJobType())) {
-//                    //获取管理员所在科室
-//                    List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
-//                            .eq("is_deleted", IsDeleteEnum.N.getKey())
-//                            .eq("hospital_id",hospitalId)
-//                            .eq("user_id",principleId)
-//                    ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
-//                    //获取所有院区核查人员所在科室
-//                    CheckUserVO checkUserVOS = new CheckUserVO();
-//                    checkUserVOS.setRoleIds(Lists.newArrayList(CheckerRoleEnum.HOSP_GENERAL.getKey()*1l));
-//                    checkUserVOS.setDeptStations(Lists.newArrayList("住院"));
-//                    checkUserVOS.setHospitalId(hospitalId);
-//                    List<CheckUserDTO> checkUserDTOS = baseMapper.getCheckUser(checkUserVOS);
-//                    Set<String> hospGeneralDeptIds= checkUserDTOS.stream()
-//                            .map(CheckUserDTO::getDeptId).collect(Collectors.toSet());
-//                    //去除管理员所在科室
-//                    if(hospGeneralDeptIds!=null&&!hospGeneralDeptIds.isEmpty()&&deptIds!=null){
-//                        hospGeneralDeptIds.removeAll(deptIds);
-//                        checkJobVO.setDeptList(new ArrayList<>(hospGeneralDeptIds));
-//                    }
                     return getCheckList(checkJobVO);
                 }
             }
@@ -728,7 +713,6 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
                     throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "院级核查人员和核查病历是同一科室");
                 }
             }
-
         }
         //获取人员id 和 该人员的医院id
         Long hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
@@ -759,6 +743,25 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
             if (principleName == null) {
                 principleName = "";
             }
+            
+            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)+"");
+	                 }
+				}
+            }
+            
+            
+            
+            
             Date now = DateUtil.now();
             //3.2分配核查任务
             return this.update(new UpdateWrapper<MedCheckInfo>()
@@ -833,4 +836,8 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         checkJobDTOS.setRecords(outCheckJobDTOS);
         return checkJobDTOS;
     }
+
+	public List<Map<String, Object>> loadFilecodeByBehospitalcode(Long hospitalId,List<String> behospitalCodeList) {
+		return baseMapper.loadFilecodeByBehospitalcode(hospitalId,behospitalCodeList);
+	}
 }

+ 29 - 6
src/main/java/com/diagbot/facade/MedCheckWorkFacade.java

@@ -134,8 +134,19 @@ public class MedCheckWorkFacade {
                 throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL, "核查任务已存在!");
             }
 
+            
             //该病历没有核查的时候, 就添加核查记录
             List<MedCheckInfo> medCheckInfoList = new ArrayList<>();
+            
+            Map<Object,Object> map = new HashMap<>();
+            
+            if(hospitalId == 13) {//温附一特定需求,闭环上报
+            	List<Map<String,Object>> aa = medCheckInfoFacade.loadFilecodeByBehospitalcode(hospitalId,medCheckWorkVO.getBehospitalCodeList());
+            	for (Map<String,Object> d : aa) {
+            		map.put(d.get("behospital_code"), d.get("file_code"));
+            	}
+            }
+            
             for (String behospitalCode : medCheckWorkVO.getBehospitalCodeList()) {
                 MedCheckInfo medCheckInfo = new MedCheckInfo();
                 medCheckInfo.setIsDeleted(IsDeleteEnum.N.getKey());
@@ -148,6 +159,14 @@ 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)+"");
+	                }
+                }
             }
             flag = medCheckInfoServiceImpl.saveBatch(medCheckInfoList);
         }
@@ -164,7 +183,11 @@ public class MedCheckWorkFacade {
      * @param nodeName			节点名称
      * @param cardNum			病案号
      */
-    public void aaa(int nodeId,String behospitalCode,String remark,String nodeName,String cardNum) {
+    public void upload(int nodeId,String behospitalCode,String remark,String nodeName,String cardNum) {
+    	
+    	
+    	
+    	
     	Map<String,Object> map = new HashMap<>();
     	map.put("code", "1201");
     	map.put("tabName", "e_zyblbr");
@@ -183,14 +206,14 @@ public class MedCheckWorkFacade {
     	
     	JSONObject json = JSON.parseObject(remark);
     	map.put("doctorId",json.getJSONObject("data").get("yongHuID"));
-    	map.put("wardId",json.getJSONObject("data").get("xianBingQuID"));
-    	map.put("wardId",json.getJSONObject("data").get("xianZhuankeID"));
+    	map.put("wardId",json.getJSONObject("data").get("guDingBQID"));
+    	map.put("specId",json.getJSONObject("data").get("guDingZKID"));
     	map.put("opId",map.get("doctorId"));
     	map.put("opName",json.getJSONObject("data").get("XingMing"));
-    	map.put("operatorDepId",json.getJSONObject("data").get("XianBuMenID"));
-    	map.put("operatorDepName",json.getJSONObject("data").get("XianBuMenMC"));
+    	map.put("operatorDepId",json.getJSONObject("data").get("guDingBMID"));
+    	map.put("operatorDepName",json.getJSONObject("data").get("guDingBMMC"));
     	try {
-	    	HttpPost post = new HttpPost("https://wsyy.wzhospital.cn:8443/authentication/v1/login/getTokenUser");
+	    	HttpPost post = new HttpPost("http://10.104.141.84:30030/ClosedLoopApi/swagger/ui/index#!/DataProcess/DataProcess_setData");
 	    	post.setHeader("Content-Type", "application/json;charset=UTF-8");
 	    	StringEntity se = new StringEntity(JSON.toJSONString(map));
 	    	se.setContentEncoding("utf-8");

+ 34 - 14
src/main/java/com/diagbot/facade/QcresultInfoFacade.java

@@ -9,6 +9,7 @@ import com.diagbot.dto.QcCasesHistoryDTO;
 import com.diagbot.dto.QcResultDTO;
 import com.diagbot.dto.SentEntryRecordDTO;
 import com.diagbot.entity.*;
+import com.diagbot.enums.CheckTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -28,7 +29,9 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -57,6 +60,8 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
     private QcModeFacade qcModeFacade;
     @Autowired
     private SysUserFacade sysUserFacade;
+    @Autowired
+    MedCheckWorkFacade medCheckWorkFacade;
 
     /**
      * 修改评分结果信息
@@ -85,28 +90,17 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该医院下该病历号不存在!");
         }
         //验证是否评估过
-        QcresultInfo qcresultInfo
-                = this.getOne(
-                new QueryWrapper<QcresultInfo>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("hospital_id", hospitalId)
-                        .eq("behospital_code", qcresultVO.getBehospitalCode()), false);
+        QcresultInfo qcresultInfo = this.getOne(new QueryWrapper<QcresultInfo>().eq("is_deleted", IsDeleteEnum.N.getKey()).eq("hospital_id", hospitalId).eq("behospital_code", qcresultVO.getBehospitalCode()), false);
         if (null == qcresultInfo) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历尚未评分,请先评分!");
         }
         //查询质控评分明细信息
         qcresultVO.setHospitalId(hospitalId);
-        List<QcresultDetail> qcresultDetails
-                = qcresultDetailServiceImpl.list(
-                new QueryWrapper<QcresultDetail>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("hospital_id", hospitalId)
-                        .eq("behospital_code", qcresultVO.getBehospitalCode()));
+        List<QcresultDetail> qcresultDetails = qcresultDetailServiceImpl.list(new QueryWrapper<QcresultDetail>().eq("is_deleted", IsDeleteEnum.N.getKey()).eq("hospital_id", hospitalId).eq("behospital_code", qcresultVO.getBehospitalCode()));
 
         //评分
         AlgorithmVO algorithmVO = new AlgorithmVO();
-        List<QcResultAlgVO> qcResultAlgVOList
-                = BeanUtil.listCopyTo(qcresultDetails, QcResultAlgVO.class);
+        List<QcResultAlgVO> qcResultAlgVOList = BeanUtil.listCopyTo(qcresultDetails, QcResultAlgVO.class);
         algorithmVO.setType(qcresultVO.getType());
         algorithmVO.setOptResultAlgVO(qcresultVO.getOptResultAlgVO());
         algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
@@ -121,6 +115,32 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
         analyzeVO.setBehospitalCode(qcresultVO.getBehospitalCode());
         analyzeVO.setDelStatus(qcresultVO.getDelStatus());
         Date date = this.saveQcResult(algorithmDTO, algorithmVO, analyzeVO, null, null, false, qcresultInfo);
+        
+        if(hospitalId == 13) {//温附一特定需求,闭环上报
+        	Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
+        	QueryWrapper<SysUser> userQuer = new QueryWrapper<>();
+        	userQuer.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", principleId).eq("status", 1);
+        	SysUser user = sysUserFacade.getOne(userQuer);
+        	
+        	List<Map<String,Object>> aa = medCheckInfoFacade.loadFilecodeByBehospitalcode(hospitalId,Arrays.asList(qcresultVO.getBehospitalCode()));
+        	Map<Object,Object> map = new HashMap<>();
+        	for (Map<String,Object> d : aa) {
+        		map.put(d.get("behospital_code"), d.get("file_code"));
+        	}
+        	
+        	 QueryWrapper<MedCheckInfo> medCheckInfoQueryWrapper = new QueryWrapper<>();
+             medCheckInfoQueryWrapper.eq("behospital_code", qcresultVO.getBehospitalCode());
+             medCheckInfoQueryWrapper.eq("hospital_id", hospitalId);
+             medCheckInfoQueryWrapper.eq("check_type", CheckTypeEnum.ALL.getKey());
+             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())+"");
+        	}
+        }
+        
         //返回参数组装
         AnalyzeDTO analyzeDTO = new AnalyzeDTO();
         analyzeDTO.setBehospitalCode(qcresultVO.getBehospitalCode());

+ 34 - 6
src/main/java/com/diagbot/facade/RecordCheckFacade.java

@@ -1,5 +1,15 @@
 package com.diagbot.facade;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.BehospitalInfoAgeDTO;
@@ -9,6 +19,7 @@ import com.diagbot.entity.BasDeptInfo;
 import com.diagbot.entity.MedAppealInfo;
 import com.diagbot.entity.MedBehospitalType;
 import com.diagbot.entity.MedCheckInfo;
+import com.diagbot.entity.SysUser;
 import com.diagbot.entity.SysUserDept;
 import com.diagbot.entity.SysUserRole;
 import com.diagbot.enums.CheckJobTypeEnum;
@@ -25,16 +36,10 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.CheckedRecordListVO;
-import com.diagbot.vo.MedCheckInfoAddVO;
 import com.diagbot.vo.RecordCheckVO;
 import com.diagbot.vo.SysUserBaseVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -64,6 +69,8 @@ public class RecordCheckFacade {
     private SysHospitalSetFacade sysHospitalSetFacade;
     @Autowired
     private MedAppealInfoManagementFacade appealInfoManagementFacade;
+    @Autowired
+    MedCheckWorkFacade medCheckWorkFacade;
 
     public IPage<CheckedRecordListDTO> checkedRecordList(CheckedRecordListVO checkedRecordListVO) {
         Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
@@ -162,8 +169,11 @@ public class RecordCheckFacade {
     public boolean recordCheck(RecordCheckVO recordCheckVO) {
         Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
         Long userId = Long.parseLong(SysUserUtils.getCurrentPrincipleID());
+        Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
         //获取核查与申诉是否相关配置(核查完成是否有申诉时的内容)
         checkAppealRelation(hospitalId,recordCheckVO);
+        
+        
         QueryWrapper<MedCheckInfo> medCheckInfoQueryWrapper = new QueryWrapper<>();
         medCheckInfoQueryWrapper.eq("behospital_code", recordCheckVO.getBehospitalCode());
         medCheckInfoQueryWrapper.eq("hospital_id", hospitalId);
@@ -173,6 +183,24 @@ public class RecordCheckFacade {
         if (medCheckInfo == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据您暂无核查权限!");
         }
+        if(hospitalId == 13) {//温附一特定需求,闭环上报
+        	
+        	QueryWrapper<SysUser> userQuer = new QueryWrapper<>();
+        	userQuer.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", principleId).eq("status", 1);
+        	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())+"");
+        	}
+        }
 
         medCheckInfo.setStatus(1);
         medCheckInfo.setCheckTime(DateUtil.now());

+ 17 - 61
src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -32,8 +32,6 @@ import org.springframework.util.StringUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -64,6 +62,7 @@ import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
+import com.diagbot.service.SysUserHospitalService;
 import com.diagbot.service.impl.SysUserDeptServiceImpl;
 import com.diagbot.service.impl.SysUserRoleServiceImpl;
 import com.diagbot.service.impl.SysUserServiceImpl;
@@ -106,6 +105,9 @@ public class SysUserFacade extends SysUserServiceImpl {
     @Qualifier("sysUserRoleServiceImpl")
     private SysUserRoleServiceImpl sysUserRoleService;
 
+    @Autowired
+    private SysUserHospitalService sysUserHospitalService;
+    
     @Autowired
     @Qualifier("sysUserDeptServiceImpl")
     private SysUserDeptServiceImpl sysUserDeptService;
@@ -116,8 +118,6 @@ public class SysUserFacade extends SysUserServiceImpl {
     @Autowired
     private SysRoleFacade sysRoleFacade;
 
-    @Autowired
-    private SysUserHospitalFacade sysUserHospitalFacade;
     @Autowired
     private SysUserRoleFacade sysUserRoleFacade;
     @Autowired
@@ -182,22 +182,13 @@ public class SysUserFacade extends SysUserServiceImpl {
     		// 创建 GET 请求对象
 	    		HttpGet httpGet = new HttpGet("https://wsyy.wzhospital.cn:8443/authentication/v1/login/getTokenUser");
 	    		httpGet.addHeader("token", userLoginVO.getAuthToken());
-	    		// 调用 HttpClient 的 execute 方法执行请求
 	    		CloseableHttpResponse response = HttpClients.createDefault().execute(httpGet);
-	    		// 获取请求状态
-	    		int code = response.getCode();
-	    		// 如果请求成功
-	    		if(code == HttpStatus.SC_OK){
+	    		if(response.getCode() == HttpStatus.SC_OK){
 	    			String result = EntityUtils.toString(response.getEntity());
 	    			JSONObject json = JSON.parseObject(result);
 	    			
 	    			String userId = json.getJSONObject("data").getInteger("yongHuID")+"_"+json.getJSONObject("data").getString("xingMing");
 	    			
-	    			sys_user
-	    			sys_user_role
-	    			sys_user_hospital
-	    			
-	    			
 	    	        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
 	    	        userQueryWrapper.eq("username", userId);
 	    	        SysUser user = this.getOne(userQueryWrapper, false);
@@ -208,13 +199,14 @@ public class SysUserFacade extends SysUserServiceImpl {
 	    	        	new_user.setCreator("0");
 	    	        	new_user.setUsername(userId);
 	    	        	new_user.setLinkman(json.getJSONObject("data").getString("xingMing"));
+	    	        	new_user.setPassword("{bcrypt}$2a$10$qhV.bPLz1xsjQKQc35Ohz.oMU2y.lffnogvLEK69u3Z1rbLpQVFh2");
 	    	        	new_user.setType(0);
 	    	        	new_user.setStatus(1);
+	    	        	new_user.setRemark(JSON.toJSONString(json.getJSONObject("data")));
 	    	        	save(new_user);
-	    	        	
 	    	        	user = new_user;
-	    	        	//关联角色
 	    	        	
+	    	        	//关联角色
 	    	        	SysUserRole sur = new SysUserRole();
 	    	        	sur.setIsDeleted("N");
 	    	        	sur.setCreator("0");
@@ -224,38 +216,15 @@ public class SysUserFacade extends SysUserServiceImpl {
 	    	        	
 	    	        	//关联医院
 	    	        	SysUserHospital suh = new SysUserHospital();
-	    	        	suh.setIsDeleted();
-	    	        	
-	    	        	 /**
-	    	             * 是否删除,N:未删除,Y:删除
-	    	             */
-	    	            private String isDeleted;
-
-
-	    	            /**
-	    	             * 用户主键
-	    	             */
-	    	            private Long userId;
-
-	    	            /**
-	    	             * 医院ID
-	    	             */
-	    	            private Long hospitalId;
-
-	    	            /**
-	    	             * 备注
-	    	             */
-	    	            private String remark;
-	    	            
-	    	        	
+	    	        	suh.setIsDeleted("N");
+	    	        	suh.setUserId(new_user.getId());
+	    	        	suh.setHospitalId(13L);
+	    	        	sysUserHospitalService.save(suh);
 	    	        }else {
-	    	        	//设置部门
-	    	        	user.setRemark(result);
-	    	        }
-	    	        JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2","password", userLoginVO.getUsername(), "");
-	    	        if (null == jwt) {
-	    	            throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
+	    	        	user.setRemark(JSON.toJSONString(json.getJSONObject("data")));
+	    	        	updateById(user);
 	    	        }
+	    	        JWT 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());
@@ -280,20 +249,7 @@ public class SysUserFacade extends SysUserServiceImpl {
 	    	        //每次登录在redis缓存该用户登录成功的token;缓存时间为token有效时间
 	    	        long accessTokenTime = sysDictionaryFacade.getAccessTokenOutTime();
 	    	        redisUtils.set("user:refreshToken:outTime_" + user.getId(), accessTokenTime, accessTokenTime);
-	    	        //   获取用户医院id
-	    	        //     String hospitalID = SysUserUtils.getCurrentHospitalID();
-	    	        Long id = user.getId();
-	    	        QueryWrapper<SysUserHospital> UserHospitalQueryWrapper = new QueryWrapper<>();
-	    	        UserHospitalQueryWrapper.eq("user_id", id).eq("is_deleted", IsDeleteEnum.N.getKey());
-	    	        SysUserHospital userHospital = sysUserHospitalFacade.getOne(UserHospitalQueryWrapper, false);
-	    	        Long hospitalId = userHospital.getHospitalId();
-	    	        String idStr = String.valueOf(hospitalId);
-	    	        Boolean passwordRegular = passwordRegular(userLoginVO.getPassword(), idStr);
-	    	        if (!passwordRegular) {
-	    	            data.setPasswordComplexity("未修改初始密码,请及时修改密码");
-	    	        }
 	    	        return data;
-	    			//查找是否有这个用户
 	    		}
     		}catch(Exception e) {
     			e.printStackTrace();
@@ -375,7 +331,7 @@ public class SysUserFacade extends SysUserServiceImpl {
         UserHospitalQueryWrapper
                 .eq("user_id", id)
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
-        SysUserHospital userHospital = sysUserHospitalFacade.getOne(UserHospitalQueryWrapper, false);
+        SysUserHospital userHospital = sysUserHospitalService.getOne(UserHospitalQueryWrapper, false);
         Long hospitalId = userHospital.getHospitalId();
         String idStr = String.valueOf(hospitalId);
         Boolean passwordRegular = passwordRegular(userLoginVO.getPassword(), idStr);
@@ -916,7 +872,7 @@ public class SysUserFacade extends SysUserServiceImpl {
      */
     private void checkUser(Long userId) {
         //确认用户是否是管理员统一医院下的用户
-        Integer cnt = sysUserHospitalFacade.count(new QueryWrapper<SysUserHospital>()
+        Integer cnt = sysUserHospitalService.count(new QueryWrapper<SysUserHospital>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("user_id", userId)
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalID())

+ 0 - 13
src/main/java/com/diagbot/facade/SysUserHospitalFacade.java

@@ -1,13 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.SysUserHospitalServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/28 15:03
- */
-@Component
-public class SysUserHospitalFacade extends SysUserHospitalServiceImpl {
-}

+ 8 - 3
src/main/java/com/diagbot/mapper/MedCheckInfoMapper.java

@@ -1,5 +1,10 @@
 package com.diagbot.mapper;
 
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.CheckJobDTO;
@@ -9,13 +14,10 @@ import com.diagbot.dto.CheckedRecordListDTO;
 import com.diagbot.dto.DeptCheckUserDTO;
 import com.diagbot.entity.MedCheckInfo;
 import com.diagbot.vo.CheckJobPageVO;
-import com.diagbot.vo.CheckJobVO;
 import com.diagbot.vo.CheckUserVO;
 import com.diagbot.vo.CheckWorkPageVO;
 import com.diagbot.vo.CheckedRecordListVO;
 
-import java.util.List;
-
 /**
  * <p>
  * 核查表 Mapper 接口
@@ -39,4 +41,7 @@ public interface MedCheckInfoMapper extends BaseMapper<MedCheckInfo> {
     IPage<CheckedRecordListDTO> checkedRecordList(CheckedRecordListVO checkedRecordListVO);
     //获取核查人员用户科室、姓名、角色
     List<CheckUserDTO> getCheckUser(CheckUserVO checkUserVOS);
+    
+    
+	List<Map<String, Object>> loadFilecodeByBehospitalcode(@Param("hospitalId")Long hospitalId,@Param("bcs") List<String> behospitalCodeList);
 }

+ 46 - 14
src/main/java/com/diagbot/web/MedAppealExamineInfoController.java

@@ -1,7 +1,23 @@
 package com.diagbot.web;
 
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.client.MedAppealExamineInfoServiceClientFacade;
@@ -10,9 +26,14 @@ import com.diagbot.dto.GetAppealReviewDTO;
 import com.diagbot.dto.GetComplaintRecordDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.QcresultDetail;
+import com.diagbot.entity.SysUser;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.MedAppealExamineInfoManagementFacade;
+import com.diagbot.facade.MedCheckInfoFacade;
+import com.diagbot.facade.MedCheckWorkFacade;
 import com.diagbot.facade.SysDictionaryFacade;
 import com.diagbot.facade.SysHospitalSetFacade;
+import com.diagbot.facade.SysUserFacade;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.ApprovedVo;
@@ -22,18 +43,9 @@ import com.diagbot.vo.GetAuditNumberVO;
 import com.diagbot.vo.GetComplaintDetailMsgVO;
 import com.diagbot.vo.GetComplaintRecordVO;
 import com.diagbot.vo.RejectedVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.Map;
 
 
 /**
@@ -57,6 +69,12 @@ public class MedAppealExamineInfoController {
     MedAppealExamineInfoManagementFacade medAppealExamineInfoManagementFacade;
     @Autowired
     SysHospitalSetFacade sysHospitalSetFacade;
+    @Autowired
+    MedCheckWorkFacade medCheckWorkFacade;
+    @Autowired
+    MedCheckInfoFacade medCheckInfoFacade;
+    @Autowired
+    SysUserFacade sysUserFacade;
 
     @ApiOperation(value = "获取申述记录列表[by:zhanghang]",
             notes = "获取申诉任务接口")
@@ -81,8 +99,7 @@ public class MedAppealExamineInfoController {
         return medAppealExamineInfoServiceClientFacade.getAppealReview(getAppealReviewVO);
     }
 
-    @ApiOperation(value = "审核通过[by:zhanghang]",
-            notes = "审核通过")
+    @ApiOperation(value = "审核通过[by:zhanghang]",notes = "审核通过")
     @PostMapping("/approved")
     @Transactional
     public RespDTO<Boolean> approved(@RequestBody ApprovedVo approvedVo) {
@@ -97,8 +114,23 @@ public class MedAppealExamineInfoController {
             JSONObject mapJSON = JSONObject.parseObject(mapping);
             approvedVo.setWorkFlowNodeId(mapJSON.getLong("approved"));
         }
-        // return RespDTO.onSuc(medAppealExamineInfoServiceClient.approved(approvedVo));
-        return RespDTO.onSuc(medAppealExamineInfoManagementFacade.approved(approvedVo));
+        Boolean approved = medAppealExamineInfoManagementFacade.approved(approvedVo);
+        if(approved) {
+            Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
+       	 	if("13".equals(hospitalId)) {//温附一特定需求,闭环上报
+            	QueryWrapper<SysUser> userQuer = new QueryWrapper<>();
+            	userQuer.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", principleId).eq("status", 1);
+            	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"));
+            	}
+        		medCheckWorkFacade.upload(626, approvedVo.getBehospitalCode(),  user.getRemark(), "申诉审核答复",map.get(approvedVo.getBehospitalCode())+"");
+            }
+       }
+		return RespDTO.onSuc(approved);
     }
 
     @ApiOperation(value = "驳回[by:zhanghang]",

+ 35 - 6
src/main/java/com/diagbot/web/MedAppealInfoController.java

@@ -5,8 +5,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.MedAppealInfoServiceClientFacade;
 import com.diagbot.dto.*;
+import com.diagbot.entity.SysUser;
 import com.diagbot.entity.SysUserRole;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.MedCheckInfoFacade;
+import com.diagbot.facade.MedCheckWorkFacade;
 import com.diagbot.facade.SysHospitalSetFacade;
 import com.diagbot.facade.SysUserFacade;
 import com.diagbot.facade.SysUserRoleFacade;
@@ -26,6 +29,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -56,6 +61,12 @@ public class MedAppealInfoController {
     @Autowired
     SysUserFacade sysUserFacade;
 
+    @Autowired
+    MedCheckWorkFacade medCheckWorkFacade;
+    
+    @Autowired
+    MedCheckInfoFacade medCheckInfoFacade;
+    
     @ApiOperation(value = "申诉[by:songxl]",
             notes = "申诉")
     @PostMapping("/addAppealInfo")
@@ -77,10 +88,9 @@ public class MedAppealInfoController {
         return medAppealInfoServiceClientFacade.addAppealInfo(addAppealInfoVO);
     }
 
-    @ApiOperation(value = "申诉-对外api接口[by:songxl]",
-            notes = "申诉")
-    @PostMapping("/addAppealInfoApi")
     @Transactional
+    @PostMapping("/addAppealInfoApi")
+    @ApiOperation(value = "申诉-对外api接口[by:songxl]",notes = "申诉")
     public RespDTO<Boolean> addAppealInfoApi(@RequestBody @Valid AddAppealInfoApiVO addAppealInfoApiVO) {
         AddAppealInfoVO addAppealInfoVO = new AddAppealInfoVO();
         BeanUtils.copyProperties(addAppealInfoApiVO, addAppealInfoVO);
@@ -101,11 +111,30 @@ public class MedAppealInfoController {
             addAppealInfoVO.setSingleAppealFalg(Boolean.parseBoolean(single_appeal_falg));
         }
 
-        return medAppealInfoServiceClientFacade.addAppealInfo(addAppealInfoVO);
+        RespDTO<Boolean> addAppealInfo = medAppealInfoServiceClientFacade.addAppealInfo(addAppealInfoVO);
+        if(addAppealInfo.data) {
+        	 Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
+             Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
+        	 if(hospitalId == 13) {//温附一特定需求,闭环上报
+             	QueryWrapper<SysUser> userQuer = new QueryWrapper<>();
+             	userQuer.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", principleId).eq("status", 1);
+             	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"));
+             	}
+         		medCheckWorkFacade.upload(625, addAppealInfoVO.getBehospitalCode(),  user.getRemark(), "病历复核申诉",map.get(addAppealInfoVO.getBehospitalCode())+"");
+             }
+        }
+        
+		return addAppealInfo;
     }
 
-    @ApiOperation(value = "获取审核人-对外api接口[by:songxl]",
-            notes = "获取审核人")
+    
+    
+    @ApiOperation(value = "获取审核人-对外api接口[by:songxl]",notes = "获取审核人")
     @PostMapping("/getReviewerApi")
     public RespDTO<List<GetReviewerDTO>> getReviewerApi(@RequestBody GetReviewerApiVO getReviewerApiVO) {
         //申诉人是否包含自身开关

+ 10 - 9
src/main/java/com/diagbot/web/MedCheckInfoController.java

@@ -1,6 +1,15 @@
 package com.diagbot.web;
 
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.CheckDeptDTO;
@@ -9,21 +18,13 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.MedCheckInfoFacade;
 import com.diagbot.facade.MedCheckWorkFacade;
 import com.diagbot.vo.CheckJobPageVO;
-import com.diagbot.vo.CheckJobVO;
 import com.diagbot.vo.DistributionJobVO;
 import com.diagbot.vo.MedCheckInfoAddVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * 核查表 前端控制器

+ 12 - 0
src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -58,6 +58,18 @@
         </if>
         order by c.dept_id
     </select>
+    
+    
+    <select id="loadFilecodeByBehospitalcode" resultType="map">
+        SELECT * from med_behospital_info
+        where is_deleted = "N" and hospital_id = #{hospitalId}
+        and behospital_code in
+        <foreach collection="bcs" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+    
+    
     <!--核查人员通过id获取核查人员的核查任务数-->
     <select id="getDeptJobNumByUserId" resultType="com.diagbot.dto.DeptCheckUserDTO">
         SELECT

+ 0 - 83
src/test/java/com/diagbot/CodeGeneration.java

@@ -1,83 +0,0 @@
-package com.diagbot;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-/**
- * @Description: 代码生成器
- * @author: gaodm
- * @time: 2018/8/2 10:15
- */
-public class CodeGeneration {
-
-    /**
-     *
-     * @Title: main
-     * @Description: 生成
-     * @param args
-     */
-    public static void main(String[] args) {
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("D://code");
-        gc.setFileOverride(true);
-        gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
-        gc.setEnableCache(false);// XML 二级缓存
-        gc.setBaseResultMap(true);// XML ResultMap
-        gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("zhanghang");// 作者
-
-        // 自定义文件命名,注意 %s 会自动填充表实体属性!
-        gc.setControllerName("%sController");
-        gc.setServiceName("%sService");
-        gc.setServiceImplName("%sServiceImpl");
-        gc.setMapperName("%sMapper");
-        gc.setXmlName("%sMapper");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
-        mpg.setDataSource(dsc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-//        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
-        strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "med_check_info"}); // 需要生成的表
-
-        strategy.setSuperServiceClass(null);
-        strategy.setSuperServiceImplClass(null);
-        strategy.setSuperMapperClass(null);
-
-        mpg.setStrategy(strategy);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setParent("com.diagbot");
-        pc.setController("web");
-        pc.setService("service");
-        pc.setServiceImpl("service.impl");
-        pc.setMapper("mapper");
-        pc.setEntity("entity");
-        pc.setXml("resources.mapper");
-        mpg.setPackageInfo(pc);
-
-        // 执行生成
-        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
-        mpg.execute();
-
-    }
-}

+ 0 - 16
src/test/java/com/diagbot/MrqcSysApplicationTests.java

@@ -1,16 +0,0 @@
-package com.diagbot;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class MrqcSysApplicationTests {
-
-    @Test
-    public void contextLoads() {
-    }
-
-}