From 049e6ac0a7b0bf5483f3b959bd9aba86d020bb31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=97=AD?= <17615834396@163.com> Date: Mon, 16 Oct 2023 10:40:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=9F=BA=E7=A1=80=E7=96=BE=E7=97=85=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/nurseapplogin/impl/NurseAppLoginServiceImpl.java | 4 +++- .../xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java index ba9bce0..414e087 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java +++ b/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()); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java index 97ee956..faa5201 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java +++ b/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; } From f4d3bf9a3bb1bbb2b93d9f5899ce77268b98da3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=94=B2=E8=BE=89?= Date: Mon, 16 Oct 2023 13:08:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xinelu-admin/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinelu-admin/src/main/resources/application.yml b/xinelu-admin/src/main/resources/application.yml index 6617333..dadcde7 100644 --- a/xinelu-admin/src/main/resources/application.yml +++ b/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/* From 11432e39d8d031572d5d0281cb7a6f5464a806ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= Date: Mon, 16 Oct 2023 13:31:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinelu/manage/service/information/IInformationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/information/IInformationService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/information/IInformationService.java index 3cb9498..c7ee467 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/information/IInformationService.java +++ b/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); -} +} \ No newline at end of file From 14055eaf2f332981d553b6de336b725370fbc354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= Date: Mon, 16 Oct 2023 13:47:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResidentPatientInfoServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java index de51f3c..715033c 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java +++ b/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(body.getDiseaseList() != null) { - patientInfo.setDisease(body.getDiseaseList().stream().collect(Collectors.joining(","))); + if (ObjectUtils.isNotEmpty(patientInfo)) { + BeanUtils.copyBeanProp(patientInfo, body); + 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 list = residentPatientInfoMapper.getList(body.getOpenid(), body.getCityCode());