Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支

xinelu-admin/src/main/resources/application.yml

@@ -241,7 +241,7 @@ xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
+  excludes: /system/notice,/system/station/add,/system/station/edit,/system/stationItem/add,/system/stationItem/edit,/system/operateGoodInfo/add,/system/operateGoodInfo/edit,/system/goodsInfo/add,/system/goodsInfo/edit,/system/hospital/add,/system/hospital/edit,/system/informationInfo/add,/system/informationInfo/edit,/system/trainingItem/edit,/system/trainingItem/add
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 

xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java

@@ -153,13 +153,15 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
             // 修改
             if(!StringUtils.isBlank(body.getPatientCode())) {
                 PatientInfo patientInfo = residentPatientInfoMapper.getByCardNo(body.getCardNo());
-                BeanUtils.copyBeanProp(patientInfo, body);
+                if (ObjectUtils.isNotEmpty(patientInfo)) {
-                if(body.getDiseaseList() != null) {
+                    BeanUtils.copyBeanProp(patientInfo, body);
-                    patientInfo.setDisease(body.getDiseaseList().stream().collect(Collectors.joining(",")));
+                    if (body.getDiseaseList() != null) {
+                        patientInfo.setDisease(body.getDiseaseList().stream().collect(Collectors.joining(",")));
+                    }
+                    patientInfo.setLoginFlag(Long.valueOf(1));
+                    updatePatientInfo(patientInfo);
+                    // 注册
                 }
-                patientInfo.setLoginFlag(Long.valueOf(1));
-                updatePatientInfo(patientInfo);
-                // 注册
             } else {
                 // 获取当前微信绑定的居民
                 List<PatientInfo> list = residentPatientInfoMapper.getList(body.getOpenid(), body.getCityCode());

xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java

@@ -177,7 +177,9 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
             patientDisease.setAge(AgeUtil.getAgeMonth(String.valueOf(patientDisease.getBirthDate())));
         }
         if (Objects.nonNull(patientDisease) && StringUtils.isNotBlank(patientDisease.getDisease())) {
-            patientDisease.setDiseaseList(patientDisease.getDisease().split(""));
+            patientDisease.setDiseaseList(Arrays.stream(patientDisease.getDisease().split(","))
+                    .map(Integer::valueOf)
+                    .toArray(Integer[]::new));
         }
         if (Objects.nonNull(patientDisease) && StringUtils.isNotBlank(patientDisease.getAreaCode())) {
             SysAreaVO codeName = sysAreaMapper.getSubordinateRegionsFindSuperiorRegions(patientDisease.getAreaCode());

xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java

@@ -163,5 +163,5 @@ public class PatientAndDiseaseVO implements Serializable {
     /**
      * 基础疾病信息
      */
-    private String[] diseaseList;
+    private Integer[] diseaseList;
 }

xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/information/IInformationService.java

@@ -61,4 +61,4 @@ public interface IInformationService {
      * @return 结果
      */
     int deleteInformationById(Long id);
-}
+}