diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java index 457e74f..0fc3992 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java @@ -8,28 +8,28 @@ package com.lyms.platform.common.enums; */ public enum HearingDiagnosisEnums { DEQDGYSJXLZE(1,"单耳轻度感音神经性聋(左耳)"), - DEQDGYSJXLYE(17,"单耳轻度感音神经性聋(右耳)"), + DEQDGYSJXLYE(17,"单耳轻度感音神经性聋(右耳)"), SEQDGYSJXL(2,"双耳轻度感音神经性聋"), DEQDCDXLHBZEYZE(3,"单耳轻度传导性聋合并中耳炎(左耳)"), - DEQDCDXLHBZEYYE(18,"单耳轻度传导性聋合并中耳炎(右耳)"), + DEQDCDXLHBZEYYE(18,"单耳轻度传导性聋合并中耳炎(右耳)"), SEQDCDXLHBZEY(4,"双耳轻度传导性聋合并中耳炎"), DEZDGYSJXLZE(5,"单耳中度感音神经性聋(左耳)"), - DEZDGYSJXLYE(19,"单耳中度感音神经性聋(右耳)"), + DEZDGYSJXLYE(19,"单耳中度感音神经性聋(右耳)"), SEZDGYSJXL(6,"双耳中度感音神经性聋"), DEZDCDXLHBZEYZE(7,"单耳中度传导性聋合并中耳炎(左耳)"), - DEZDCDXLHBZEYYE(20,"单耳中度传导性聋合并中耳炎(右耳)"), + DEZDCDXLHBZEYYE(20,"单耳中度传导性聋合并中耳炎(右耳)"), SEZDCDXLHBZEY(8,"双耳中度传导性聋合并中耳炎"), DEZZDGYSJXLZE(9,"单耳中重度感音神经性聋(左耳)"), - DEZZDGYSJXLYE(21,"单耳中重度感音神经性聋(右耳)"), + DEZZDGYSJXLYE(21,"单耳中重度感音神经性聋(右耳)"), SEZZDGYSJXL(10,"双耳中重度感音神经性聋"), DEZZDCDXLHBZEYZE(11,"单耳中重度传导性聋合并中耳炎(左耳)"), - DEZZDCDXLHBZEYYE(22,"单耳中重度传导性聋合并中耳炎(右耳)"), + DEZZDCDXLHBZEYYE(22,"单耳中重度传导性聋合并中耳炎(右耳)"), SEZZDCDXLHBZEY(12,"双耳中重度传导性聋合并中耳炎"), DEZZGYSJXLZE(13,"单耳重度感音神经性聋(左耳)"), - DEZZGYSJXLYE(23,"单耳重度感音神经性聋(右耳)"), + DEZZGYSJXLYE(23,"单耳重度感音神经性聋(右耳)"), SEZDGYSJXLS(14,"双耳重度感音神经性聋"), DEJZDGYSJXLZE(15,"单耳极重度感音神经性聋(左耳)"), - DEJZDGYSJXLYE(24,"单耳极重度感音神经性聋(右耳)"), + DEJZDGYSJXLYE(24,"单耳极重度感音神经性聋(右耳)"), SEJZDGYSJXL(16,"双耳极重度感音神经性聋"); private int id; private String name; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index 5ae006f..f01b7fc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -127,11 +127,17 @@ public class FollowUpController extends BaseController { if (StringUtils.isNotEmpty(cr[b])) { Map map = new HashMap<>(); String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b])); - mrSb.append(title+","); + mrSb.append(title+"、"); } } + String hfString = null; + if (mrSb.toString().endsWith("、")) { + hfString = mrSb.substring(0, mrSb.length() - 1); + } else { + hfString = mrSb.toString(); + } //设置确诊结果 - fuResult.setMarkResultStr(mrSb.toString()); + fuResult.setMarkResultStr(hfString); } fuResult.setMarkResult(followUp.getMarkResult()); fuResult.setMarkDetail(followUp.getMarkDetail()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java index 369304f..5972b17 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -83,7 +83,7 @@ public class HearDiagnManageController extends BaseController { } //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - + //获取机构内同一儿童babyIds List babyIds = earFacade.getBabyIdsByItemOrg(babyId,hospitalId); @@ -102,7 +102,7 @@ public class HearDiagnManageController extends BaseController { //儿童听力随访记录 BabyPatientExtendEarFollowUpQuery earFollowUpQuery = new BabyPatientExtendEarFollowUpQuery(); - earFollowUpQuery.setBabyId(babyId); + earFollowUpQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); earFollowUpQuery.setIfdel(0); earFollowUpQuery.setSort("follow_time"); List earFollowUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUpByBaby(earFollowUpQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 3805ffd..e4b76ab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -784,7 +784,10 @@ public class HearingDiagnoseController extends BaseController { //医院id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - + //确诊 加入确诊时间 + if(obj.getIsconfirm()==1){ + obj.setConfirmTime(new Date()); + } obj.setIfdel(0); obj.setCreateTime(new Date()); obj.setCreateId(String.valueOf(loginState.getId()));