Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -243,21 +243,21 @@ public class PushFacade {
      */
     public LisKYJVO resultCalculation(LisKYJVO lisKYJVO) {
         if (lisKYJVO.getValue() != null) {
-            if (lisKYJVO.getMax() != null) {
-                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMax());
+            if (lisKYJVO.getMaxValue() != null) {
+                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMaxValue());
                 if (comResult > 0) {
                     lisKYJVO.setMultipleState(QuantitativeTypeEnum.Up.getName());
-                    if (!lisKYJVO.getMax().equals(0.0)) {
-                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMax());
+                    if (!lisKYJVO.getMaxValue().equals(0.0)) {
+                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMaxValue());
                     }
                 }
             }
-            if (lisKYJVO.getMin() != null) {
-                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMax());
+            if (lisKYJVO.getMinValue() != null) {
+                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMinValue());
                 if (comResult < 0) {
                     lisKYJVO.setMultipleState(QuantitativeTypeEnum.Down.getName());
-                    if (!lisKYJVO.getMax().equals(0.0)) {
-                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMin());
+                    if (!lisKYJVO.getMinValue().equals(0.0)) {
+                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMinValue());
                     }
                 }
             }

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -35,37 +35,19 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
      * @return 医生病历模板信息
      */
     public List<TemplateInfoDTO> findByDoctorIdTemplates(TemplateInfoVO templateInfoVO) {
-		/*//根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
-		TemplateInfo templateInfo = new TemplateInfo();
-		templateInfo.setDoctorId(templateInfoVO.getDoctorId());//医生id
-		templateInfo.setHospitalDeptId(templateInfoVO.getHospitalDeptId());//部门id
-		templateInfo.setHospitalId(templateInfoVO.getHospitalId());//医院id
-		List<TemplateInfoDTO> data = findByDoctorIdTemplate(templateInfo);*/
+		//根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
+		
         QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
         Map<String, Object> mapAll = new HashMap<>();
         mapAll.put("hospital_dept_id", templateInfoVO.getHospitalDeptId());
         mapAll.put("doctor_id", templateInfoVO.getDoctorId());
         mapAll.put("hospital_id", templateInfoVO.getHospitalId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        mapAll.put("type", templateInfoVO.getType());
         templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
         List<TemplateInfoDTO> data = new ArrayList<TemplateInfoDTO>();
         List<TemplateInfo> datas = list(templateInfoQuery);
-		/*for(TemplateInfo templateInfo :datas){
-			TemplateInfoDTO templateInfoDTO =new TemplateInfoDTO();
-			templateInfoDTO.setId(templateInfo.getId());
-			templateInfoDTO.setCreator(templateInfo.getCreator());
-			templateInfoDTO.setDataJson(templateInfo.getDataJson());
-			templateInfoDTO.setDoctorId(templateInfo.getDoctorId());
-			templateInfoDTO.setGmtCreate(templateInfo.getGmtCreate());
-			templateInfoDTO.setHospitalDeptId(templateInfo.getHospitalDeptId());
-			templateInfoDTO.setHospitalId(templateInfo.getHospitalId());
-			templateInfoDTO.setModeName(templateInfo.getName());
-			templateInfoDTO.setModeType(templateInfo.getType());
-			templateInfoDTO.setPreview(templateInfo.getPreview());
-			templateInfoDTO.setRemark(templateInfo.getRemark());
-			
-			data.add(templateInfoDTO);
-		}*/
+		//过滤
         data = BeanUtil.listCopyTo(datas, TemplateInfoDTO.class);
 
         return data;

icss-service/src/main/java/com/diagbot/vo/LisInfo.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:化验信息
+ * @Author:zhaops
+ * @time: 2018/12/19 14:03
+ */
+@Getter
+@Setter
+public class LisInfo {
+    private String name;//套餐名称
+    private String detailName;//化验项名称
+    private Double value;//值
+    private Double maxValue;//最大值
+    private Double minValue;//最小值
+    private String units;//单位
+    private String otherValue;//其他结果，包括阴性阳性，文字描述等
+}

icss-service/src/main/java/com/diagbot/vo/LisKYJVO.java

@@ -13,8 +13,8 @@ import lombok.Setter;
 public class LisKYJVO {
     private String name;//名称
     private Double value;//值
-    private Double max;//最大值
-    private Double min;//最小值
+    private Double maxValue;//最大值
+    private Double minValue;//最小值
     private String units;//单位
     private String multipleState;//定量状态 0-正常 1-升高 2-降低
     private Double multipleValue;//倍数

icss-service/src/main/java/com/diagbot/vo/TemplateInfoVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 import lombok.Getter;
@@ -25,4 +26,7 @@ public class TemplateInfoVO {
 	 */
 	@NotNull(message = "请输入部门id")
 	private Long hospitalDeptId;//部门id
+	
+	@NotBlank(message = "请输入模板类型")
+	private String type;//模板类型
 }

icss-service/src/main/java/com/diagbot/web/TemplateInfoController.java

@@ -37,7 +37,7 @@ public class TemplateInfoController {
     TemplateInfoFacade templateInfoFacade;
 
     @ApiOperation(value = "根据医生id、医院id、部门id返回病历模板内容[by:wangfeng]",
-            notes = "doctorId: 医生id<br>" + "dospitalId：医院编码<br>" + "deptId:部门id<br>")
+            notes = "doctorId: 医生id<br>" + "dospitalId：医院编码<br>" + "deptId:部门id<br>" + "type:模式<br>")
     @PostMapping("/getByDoctorIdTemplates")
     @SysLogger("getByDoctorIdTemplates")
     public RespDTO<TemplateInfo> getByDoctorIdTemplate(@Valid @RequestBody TemplateInfoVO templateInfoVO) {

icssman-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacaed.java

@@ -1,14 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-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.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -27,6 +18,14 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DisclaimerInformationAllVO;
 import com.diagbot.vo.DisclaimerInformationIdVO;
 import com.diagbot.vo.DisclaimerInformationVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -39,7 +38,11 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
     @Autowired
     UserServiceClient userServiceClient;
 
+    
     /**
+     * 分页查询免责声明
+     * @param page
+     * @param title
      * @return
      */
     public List<DisclaimerInformationDTO> getDisclaimerInformation(Page page, String title) {
@@ -113,13 +116,7 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
      */
     public Boolean updateDisclaimerInformation(DisclaimerInformationAllVO disclaimerInformationAllVO) {
         // 1.先判断数据是否存在有效
-        QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
-        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
-                disclaimerInformationAllVO.getId());
-        int sum = count(disclaimerInformationFand);
-        if (sum == 0 ) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-        }
+        checkExist(disclaimerInformationAllVO.getId());
         // 2.修改版本详情信息
         DisclaimerInformation disclaimerInformation = new DisclaimerInformation();
 
@@ -150,14 +147,8 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
      * @return
      */
     public Boolean cancelDisclaimerInformation(DisclaimerInformationIdVO disclaimerInformationIdVO) {
-    	 // 1.先判断数据是否存在有效
-        QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
-        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
-        		disclaimerInformationIdVO.getId());
-        int sum = count(disclaimerInformationFand);
-        if (sum == 0 ) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-        }
+        // 1.先判断数据是否存在有效
+        checkExist(disclaimerInformationIdVO.getId());
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
         disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
@@ -171,14 +162,8 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
      * @return
      */
     public boolean startDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
-    	 // 1.先判断数据是否存在有效
-        QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
-        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
-        		disclaimerInformationIdVO.getId());
-        int sum = count(disclaimerInformationFand);
-        if (sum == 0 ) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-        }
+        // 1.先判断数据是否存在有效
+        checkExist(disclaimerInformationIdVO.getId());
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
         disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("status", StatusEnum.Disable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
@@ -192,14 +177,8 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
      * @return
      */
     public boolean endDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
-    	 // 1.先判断数据是否存在有效
-        QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
-        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
-        		disclaimerInformationIdVO.getId());
-        int sum = count(disclaimerInformationFand);
-        if (sum == 0 ) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-        }
+        // 1.先判断数据是否存在有效
+        checkExist(disclaimerInformationIdVO.getId());
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
         disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("status", StatusEnum.Enable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
@@ -207,4 +186,18 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
         return update(new DisclaimerInformation(), disclaimerInformationNew);
     }
 
+    /**
+     * 判断数据是否存在有效
+     *
+     * @param id
+     */
+    private void checkExist(Long id) {
+        QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
+        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+        int sum = count(disclaimerInformationFand);
+        if (sum == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
+    }
+
 }

icssman-service/src/main/java/com/diagbot/facade/QuestionInfoFacade.java

@@ -3,8 +3,10 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.QuestionPageDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.CommonParam;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.QuestionDetail;
@@ -68,6 +70,8 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
     ModuleDetailFacade moduleDetailFacade;
     @Autowired
     DeptInfoFacade deptInfoFacade;
+    @Autowired
+    UserServiceClient userServiceClient;
 
 
     /**
@@ -292,9 +296,18 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
      * @return
      */
     public IPage<QuestionPageDTO> getListFac(QuestionPageVO questionPageVO) {
-
         IPage<QuestionPageDTO> res = this.getList(questionPageVO);
-        //        List<QuestionPageDTO> data = res.getRecords();
+        if (res.getTotal() <= 0) {
+            return res;
+        }
+        List<String> personIds = res.getRecords().stream().map(row -> row.getModifier()).collect(Collectors.toList());
+        RespDTO<Map<String, String>> mapRespDTO = userServiceClient.getUserInfoByIds(personIds);
+        if (mapRespDTO == null || !"0".equals(mapRespDTO.code)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "获取操作人失败");
+        }
+        for (QuestionPageDTO bean : res.getRecords()) {
+            bean.setModifier(mapRespDTO.data.get(bean.getModifier()));
+        }
         return res;
     }
 

icssman-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -124,7 +124,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         
         List<RetrievalMapping> addOrUpdateRetrievalMappings = new ArrayList<>();
         retrievalMappings.stream().filter(i->retrievalIds.contains(i.getRetrievalId())).forEach(i->{
-        	i.setIsDeleted("Y");
+        	i.setIsDeleted(IsDeleteEnum.Y.getKey());
         	i.setGmtModified(now);
         	i.setModifier(userId);
         	addOrUpdateRetrievalMappings.add(i);
@@ -168,7 +168,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         IPage<RetrievalListDTO> ipage = this.getRetrievalList(retrievalListVO);
         List<String> ids = ipage.getRecords().stream().map(i->i.getOperatorName()).collect(Collectors.toList());
         RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-        if (respDTO == null || !"0".equals(respDTO.code)) {
+        if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取用户信息失败");
         }

icssman-service/src/main/java/com/diagbot/facade/VersionDetailFacade.java

@@ -15,11 +15,13 @@ import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionDetailDTO;
 import com.diagbot.entity.VersionDetail;
+import com.diagbot.entity.VersionInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.service.impl.VersionInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VersionDetailIdVO;
@@ -40,6 +42,8 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     VersionDetailServiceImpl versionDetailServiceImpl;
     @Autowired
     UserServiceClient userServiceClient;
+    @Autowired
+    VersionInfoServiceImpl versionInfoServiceImpl;
 
     /**
      * 根据版本id查询版本详情
@@ -129,12 +133,7 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
      */
     public boolean updateVersionDetail(VersionDetailVO versionDetailVO) {
         // 1.先判断数据是否存在有效
-        QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionDetailVO.getDetailId());
-        VersionDetail data = getOne(VersionInfoFand);
-        if (data == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-        }
+    	checkExist(versionDetailVO.getDetailId());
         // 2.修改版本详情信息
         VersionDetail versionDetail = new VersionDetail();
 
@@ -161,6 +160,8 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
      * @return
      */
     public boolean cancelVersionDetail(VersionDetailIdVO versionDetailIdVO) {
+    	 // 1.先判断数据是否存在有效
+    	checkExist(versionDetailIdVO.getId());
         UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
         versionDetailNew.in("id", versionDetailIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey()).set("is_deleted",
                 IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID()).set("gmt_modified", DateUtil.now());
@@ -175,6 +176,14 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
      */
     public boolean addVersionDetail(VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
 
+    	//1.增加明细前先判断主版本号的id是否有效
+        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionInfoAndDetailIdVO.getVersionInfoId());
+        int sum = versionInfoServiceImpl.count(VersionInfoFand);
+        if (sum == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");
+        }
+        
         List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
         List<VersionDetailVO> datas = versionInfoAndDetailIdVO.getVersionDetail();
         for (VersionDetailVO data : datas) {
@@ -197,4 +206,18 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
 
         return res;
     }
+    /**
+     * 判断数据是否存在有效
+     *
+     * @param id
+     */
+    private void checkExist(Long id) {
+    	 // 1.先判断数据是否存在有效
+    	 QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
+         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+         int sum = count(VersionInfoFand);
+         if (sum == 0) {
+             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+         }
+    }
 }

icssman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -180,12 +180,13 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      */
     public boolean updateVersionInfoAll(VersionInfoAllVO versionInfoVO) {
         // 1.先判断数据是否存在有效
-        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+    	checkExist(versionInfoVO.getId());
+/*        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionInfoVO.getId());
         VersionInfo data = getOne(VersionInfoFand);
         if (data == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-        }
+        }*/
         // 2.判断该版本号是否存在名字相同的数据
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
         templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
@@ -225,6 +226,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      * @return
      */
     public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
+    	 // 1.先判断数据是否存在有效
+    	checkExist(versionInfoVO.getId());
         UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
         versionInfoNew.in("id", versionInfoVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
@@ -232,4 +235,18 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         return update(new VersionInfo(), versionInfoNew);
     }
 
+    /**
+     * 判断数据是否存在有效
+     *
+     * @param id
+     */
+    private void checkExist(Long id) {
+    	 // 1.先判断数据是否存在有效
+        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+        VersionInfo data = getOne(VersionInfoFand);
+        if (data == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
+    }
 }