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

knowledgeman-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -153,7 +153,9 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
         // 1.先判断数据是否存在有效
         checkExist(disclaimerInformationIdVO.getId());
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
-        disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+        disclaimerInformationNew
+                .eq("id", disclaimerInformationIdVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
                 .set("gmt_modified", DateUtil.now());
         return update(new DisclaimerInformation(), disclaimerInformationNew);
@@ -180,7 +182,9 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
     	update(new DisclaimerInformation(), DisclaimerInformationStatus);
         
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
-        disclaimerInformationNew.eq("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+        disclaimerInformationNew
+                .eq("id", disclaimerInformationIdVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("status", StatusEnum.Disable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
                 .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Enable.getKey());
         return update(new DisclaimerInformation(), disclaimerInformationNew);
@@ -195,7 +199,9 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
         // 1.先判断数据是否存在有效
         checkExist(disclaimerInformationEndVO.getId());
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
-        disclaimerInformationNew.in("id", disclaimerInformationEndVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+        disclaimerInformationNew
+                .eq("id", disclaimerInformationEndVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("status", StatusEnum.Enable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
                 .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
         return update(new DisclaimerInformation(), disclaimerInformationNew);

tran-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -34,7 +34,7 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
 	public HospitalInfoDTO getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
 		QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-        			.in("code", hospitalInfoVO.getCode());
+        			.eq("code", hospitalInfoVO.getCode());
         HospitalInfo datas = this.getOne(queryWrapper, false);
         HospitalInfoDTO data =new HospitalInfoDTO();
         BeanUtil.copyProperties(datas, data);