diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml index 8869c3e..2eef4b3 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -296,7 +296,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ select - id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid + id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid from baby_patient_extend_ear_screen status = 0 @@ -638,6 +638,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ resultType="String"> select DISTINCT baby_id from baby_patient_extend_ear_screen sc + 1=1 and sc.check_hospital_id in ( @@ -645,6 +646,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ ) + + and check_hospital_id = #{checkHospitalId,jdbcType=VARCHAR} + and sc.baby_id in ( @@ -653,11 +657,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ ) - and - screen_type = 2 - and - scr_ispass = 2 - ORDER BY sc.create_date DESC + and scr_ispass = 2 + and screen_type = 2 + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index 530dd30..6f134d0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -114,6 +114,7 @@ public class EarController extends BaseController { //查询听诊记录 BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); hdQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); + hdQuery.setSort("diagnose_time"); List hdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hdQuery); if (hdList == null && hdList.size() == 0) { @@ -147,6 +148,11 @@ public class EarController extends BaseController { if (!isConfirm) {// //若没有听诊记录或所有听诊记录都未确诊。提示：该儿童还未听力确诊，不能进行随访。 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听诊记录还未有确诊记录不能进行随访"); } + + //最后一次听诊时间 + BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size()-1); + String diagnoseDate = DateUtil.getyyyy_MM_dd(ehd.getDiagnoseTime()); + initHearingDiagnose.setDiagnoseDate(diagnoseDate); //根据条件查询基础配置信息表 return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } @@ -183,7 +189,6 @@ public class EarController extends BaseController { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } - if (StringUtils.isEmpty(babyId)) {//传入儿童档案id return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); } @@ -207,7 +212,14 @@ public class EarController extends BaseController { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未完善听力建档"); } - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + //第一次 + BabyModel babyModel = babyService.getOneBabyById(babyId); + String buildDate = DateUtil.getyyyy_MM_dd(babyModel.getBuildDate()); + Map data = new HashMap<>(); + BaseResponse resObj = new BaseResponse(); + data.put("buildDate",buildDate); + resObj.setObject(data); + return resObj.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } /** @@ -309,9 +321,13 @@ public class EarController extends BaseController { babyIds.add(es.getBabyPatientId()); } + query.setSort("screen_date"); + query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); // d、本院：初筛未通过或复筛确诊 List screenList = screenService.queryBabyPatientExtendEarScreen(query); + //最后一次听筛时间 + Map data = new HashMap<>(); if (screenList == null || screenList.size() == 0) {//没有听筛记录，查询转诊记录 //查询听力转诊申请 // e、外院：有申请记录则允许进行新增听力筛查 HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery(); @@ -324,25 +340,20 @@ public class EarController extends BaseController { } else { boolean isResu = false; for (BabyPatientExtendEarScreen scr : screenList) { - if (scr.getScrIspass() == 2) {//是复筛并且未通过 + if (scr.getScrIspass() == 2) {//未通过 isResu = true; - break; } } if (!isResu) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听筛已通过，不能进行听力诊断"); } + BabyPatientExtendEarScreen earScreen = screenList.get(screenList.size()-1); + String screenDate = DateUtil.getyyyy_MM_dd(earScreen.getScreenDate()); + data.put("screenDate",screenDate); } - - //根据条件查询基础配置信息表 - InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); - // initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); - // - // initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); - // - // initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); - - return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + BaseResponse resObj = new BaseResponse(); + resObj.setObject(data); + return resObj.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } /** 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 85baeea..62e4bd9 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 @@ -369,12 +369,17 @@ public class HearingDiagnoseController extends BaseController { } } + + + BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); + + BabyPatientExtendEarScreenQuery scrQuery = new BabyPatientExtendEarScreenQuery(); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (StringUtils.isNotEmpty(hdReq.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setQueryNo(hdReq.getKeyWord()); - babyQuery.setHospitalId(hospitalId); + // babyQuery.setHospitalId(hospitalId); List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); if (CollectionUtils.isNotEmpty(models)) { List babyIds = new ArrayList<>(); @@ -382,15 +387,16 @@ public class HearingDiagnoseController extends BaseController { babyIds.add(babyModel.getBabyPatientId()); } scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); + query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); } } - //本院听筛数据 + scrQuery.setCreateHospitalId(hospitalId); + //本院听筛数据 复筛未通过-待诊断 List babyIds = screenService.queryScrBabyIds(scrQuery); - BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); if(CollectionUtils.isNotEmpty(pids)){ query.setPids((String[]) pids.toArray(new String[pids.size()])); } @@ -601,6 +607,7 @@ public class HearingDiagnoseController extends BaseController { hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth()))); hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); } + hea.setDiagnResult("待诊断"); //全部 hdrList.add(hea); //待诊断 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index d16daa9..46acb95 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -172,6 +172,7 @@ public class BabyEarFacade { /** * 根据babyid和医院Id获取babyIds + * * @param babyId * @param hospitalId * @return @@ -196,7 +197,7 @@ public class BabyEarFacade { List babyPatientExtendEars1 = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); if (CollectionUtils.isNotEmpty(babyPatientExtendEars1)) { - for(BabyPatientExtendEar ear:babyPatientExtendEars1){ + for (BabyPatientExtendEar ear : babyPatientExtendEars1) { babyIds.add(ear.getBabyPatientId()); } } @@ -210,7 +211,7 @@ public class BabyEarFacade { * @param babyId 儿童档案Id * @return 操作是否成功 */ - public boolean showBabyEar(String babyId,String hospitalId) { + public boolean showBabyEar(String babyId, String hospitalId) { if (StringUtils.isEmpty(babyId)) { return false; } @@ -222,7 +223,7 @@ public class BabyEarFacade { babyQuery.setEnable("0"); babyQuery.setHospitalId(hospitalId); List babyModels = babyService.queryBabyWithQuery(babyQuery); - if(CollectionUtils.isNotEmpty(babyModels)){ + if (CollectionUtils.isNotEmpty(babyModels)) { babyModel = babyModels.get(0); } @@ -240,7 +241,7 @@ public class BabyEarFacade { List babyPatientExtendEarBaby = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(extendEarBabyQuery); - if(CollectionUtils.isNotEmpty(babyPatientExtendEarBaby)){ + if (CollectionUtils.isNotEmpty(babyPatientExtendEarBaby)) { BabyPatientExtendEarBaby earBaby = babyPatientExtendEarBaby.get(0); earBaby.setEnable("1"); babyPatientExtendEarBabyService.updateBabyPatientExtendEarBaby(earBaby); @@ -267,7 +268,7 @@ public class BabyEarFacade { * @param hospitalId 医院Id * @return 操作是否成功 */ - public boolean addhideBabyEar(String babyId, String hospitalId,String enable) { + public boolean addhideBabyEar(String babyId, String hospitalId, String enable) { if (StringUtils.isEmpty(babyId) || StringUtils.isEmpty(hospitalId)) { return false; @@ -292,7 +293,7 @@ public class BabyEarFacade { //2-隐藏建档 0--转诊 babyModel.setEnable(enable); //隐藏建档需要baby来源id - if(enable.equals("2")){ + if (enable.equals("2")) { babyModel.setSource(babyId); } babyModel.setBuildType(3); @@ -305,8 +306,19 @@ public class BabyEarFacade { earQuery.setBabyPatientId(babyId); // earQuery.setCreateHospitalId(hospitalId); List ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); + BabyPatientExtendEar ear = null; + boolean isPass = false; if (CollectionUtils.isNotEmpty(ears)) { - BabyPatientExtendEar ear = ears.get(0); + for (BabyPatientExtendEar er : ears) { + if (hospitalId.equals(er.getCreateHospitalId())) {//相同 + isPass = true; + break; + } else { + ear = er; + } + } + } + if (!isPass) { //如果不相同转诊档案 if (!hospitalId.equals(ear.getCreateHospitalId())) { ear.setId(UUID.randomUUID().toString().replace("-", "")); @@ -315,37 +327,6 @@ public class BabyEarFacade { ear.setStatus(YnEnums.NO.getId()); babyPatientExtendEarService.addBabyPatientExtendEar(ear); - BabyPatientExtendEarBabyQuery query = new BabyPatientExtendEarBabyQuery(); - query.setBabyPatientId(babyId); - List babyPatientExtendEarBabies = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(query); - if(CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)){ - BabyPatientExtendEarBaby earBaby = babyPatientExtendEarBabies.get(0); - if(!earBaby.getHospitalId().equals(hospitalId)){ - BabyPatientExtendEarBaby babyPatientExtendEarBaby = new BabyPatientExtendEarBaby(); - babyModel = babyService.getOneBabyById(newBabyId); - babyPatientExtendEarBaby.setId(UUID.randomUUID().toString().replace("-", "")); - babyPatientExtendEarBaby.setName(babyModel.getName()); - babyPatientExtendEarBaby.setSex(babyModel.getSex()); - babyPatientExtendEarBaby.setCardno(babyModel.getCardNo()); - babyPatientExtendEarBaby.setBirth(babyModel.getBirth()); - babyPatientExtendEarBaby.setMname(babyModel.getMname()); - babyPatientExtendEarBaby.setMcertTypeId(babyModel.getMcertTypeId()); - babyPatientExtendEarBaby.setMcertNo(babyModel.getMcertNo()); - babyPatientExtendEarBaby.setMphone(babyModel.getMphone()); - babyPatientExtendEarBaby.setVcCardNo(babyModel.getVcCardNo()); - babyPatientExtendEarBaby.setBuildDoctor(babyModel.getBuildDoctor()); - babyPatientExtendEarBaby.setHospitalId(hospitalId); - babyPatientExtendEarBaby.setBuildType(babyModel.getBuildType()); - babyPatientExtendEarBaby.setYn(babyModel.getYn()); - babyPatientExtendEarBaby.setBuildDate(babyModel.getBuildDate()); - babyPatientExtendEarBaby.setEnable(babyModel.getEnable()); - babyPatientExtendEarBaby.setBabyPatientId(babyModel.getId()); - babyPatientExtendEarBaby.setBabyEarId(ear.getId()); - babyPatientExtendEarBaby.setPersonId(babyModel.getPid()); - babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby); - } - } - //儿童基本信息 BabyPatientExtendEarBirthQuery earBirthQuery = new BabyPatientExtendEarBirthQuery(); earBirthQuery.setBabyPatientId(babyId); @@ -386,10 +367,47 @@ public class BabyEarFacade { } } } + + BabyPatientExtendEarBabyQuery query = new BabyPatientExtendEarBabyQuery(); + query.setBabyPatientId(babyId); + List babyPatientExtendEarBabies = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(query); + isPass = false; + if (CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)) { + for (BabyPatientExtendEarBaby earBabys : babyPatientExtendEarBabies) { + if (hospitalId.equals(earBabys.getHospitalId())) {//相同 + isPass = true; + break; + } + } + } + + if (!isPass) { + BabyPatientExtendEarBaby babyPatientExtendEarBaby = new BabyPatientExtendEarBaby(); + babyModel = babyService.getOneBabyById(newBabyId); + babyPatientExtendEarBaby.setId(UUID.randomUUID().toString().replace("-", "")); + babyPatientExtendEarBaby.setName(babyModel.getName()); + babyPatientExtendEarBaby.setSex(babyModel.getSex()); + babyPatientExtendEarBaby.setCardno(babyModel.getCardNo()); + babyPatientExtendEarBaby.setBirth(babyModel.getBirth()); + babyPatientExtendEarBaby.setMname(babyModel.getMname()); + babyPatientExtendEarBaby.setMcertTypeId(babyModel.getMcertTypeId()); + babyPatientExtendEarBaby.setMcertNo(babyModel.getMcertNo()); + babyPatientExtendEarBaby.setMphone(babyModel.getMphone()); + babyPatientExtendEarBaby.setVcCardNo(babyModel.getVcCardNo()); + babyPatientExtendEarBaby.setBuildDoctor(babyModel.getBuildDoctor()); + babyPatientExtendEarBaby.setHospitalId(hospitalId); + babyPatientExtendEarBaby.setBuildType(babyModel.getBuildType()); + babyPatientExtendEarBaby.setYn(babyModel.getYn()); + babyPatientExtendEarBaby.setBuildDate(babyModel.getBuildDate()); + babyPatientExtendEarBaby.setEnable(babyModel.getEnable()); + babyPatientExtendEarBaby.setBabyPatientId(babyModel.getId()); + babyPatientExtendEarBaby.setBabyEarId(ear.getId()); + babyPatientExtendEarBaby.setPersonId(babyModel.getPid()); + babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby); + } return true; - } else { - return false; } + return true; } @@ -423,7 +441,7 @@ public class BabyEarFacade { if (null != baby) { String pid = null; - if(StringUtils.isNotEmpty(baby.getId())){//修改儿童信息 + if (StringUtils.isNotEmpty(baby.getId())) {//修改儿童信息 BabyModel babyModel = babyService.getOneBabyById(baby.getId()); //跟距母親的證件號查詢兒童person信息 PersonModelQuery personModelQuery = new PersonModelQuery(); @@ -436,10 +454,10 @@ public class BabyEarFacade { personModel.setPhone(baby.getName()); personModel.setCardNo(baby.getMcertNo()); personModel.setModified(new Date()); - pid = personModel.getId(); - personService.updatePerson(personModel,personModel.getId()); + pid = personModel.getId(); + personService.updatePerson(personModel, personModel.getId()); } - }else{//新增儿童信息 + } else {//新增儿童信息 //处理儿童person信息 pid = handBabyPerson(baby).getId(); } @@ -859,7 +877,7 @@ public class BabyEarFacade { hfString = historyStr.toString(); } babyEarFamilyView.setBadLifeHistory(hfString); - }else{ + } else { babyEarFamilyView.setBadLifeHistory("无"); } } @@ -956,9 +974,9 @@ public class BabyEarFacade { hfString = historyStr.toString(); } - if(StringUtils.isNotEmpty(hfString)){ + if (StringUtils.isNotEmpty(hfString)) { babyEarMotherView.setViralInfectionHistoryType(hfString); - }else{ + } else { babyEarMotherView.setViralInfectionHistoryType("无"); } } @@ -1026,9 +1044,9 @@ public class BabyEarFacade { hfString = historyStr.toString(); } - if(StringUtils.isNotEmpty(hfString)){ + if (StringUtils.isNotEmpty(hfString)) { babyEarMotherView.setGenitalInfectionHistoryType(hfString); - }else{ + } else { babyEarMotherView.setGenitalInfectionHistoryType("无"); } } @@ -1048,7 +1066,7 @@ public class BabyEarFacade { } else { historyStr.append("无"); } - }else{ + } else { historyStr.append("无"); } babyEarMotherView.setRadiationHistoryType(historyStr.toString()); @@ -1136,7 +1154,7 @@ public class BabyEarFacade { hfString = historyStr.toString(); } babyEarMotherView.setBadLifeHistoryType(hfString); - }else{ + } else { babyEarMotherView.setBadLifeHistoryType("无"); } @@ -1256,7 +1274,7 @@ public class BabyEarFacade { */ public BabyEarBirthView convertToBabyEarBirthView(BabyPatientExtendEarBirth babyPatientExtendEarBirth) { BabyEarBirthView babyEarBirthView = new BabyEarBirthView(); - babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : "第"+babyPatientExtendEarBirth.getFetuNumber() + "胎"); + babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : "第" + babyPatientExtendEarBirth.getFetuNumber() + "胎"); babyEarBirthView.setProductNumber(babyPatientExtendEarBirth.getProductNumber() == null ? "" : babyPatientExtendEarBirth.getProductNumber() + "次"); babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight()); babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight()); @@ -1273,26 +1291,26 @@ public class BabyEarFacade { babyEarBirthView.setAmnioticFluid("III度"); } } - if(StringUtils.isNotEmpty(TaiShuEnums.getTitle(babyPatientExtendEarBirth.getTireNumber()))){ + if (StringUtils.isNotEmpty(TaiShuEnums.getTitle(babyPatientExtendEarBirth.getTireNumber()))) { babyEarBirthView.setTireNumber(TaiShuEnums.getTitle(babyPatientExtendEarBirth.getTireNumber())); } String birthDefectType = "无"; - if(babyPatientExtendEarBirth.getBirthDefectType()!=null){ + if (babyPatientExtendEarBirth.getBirthDefectType() != null) { if (babyPatientExtendEarBirth.getBirthDefectType() == 1) {//有 birthDefectType = "有"; - if(StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())){ - birthDefectType = "有,"+babyPatientExtendEarBirth.getBirthDefectDesc(); + if (StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())) { + birthDefectType = "有," + babyPatientExtendEarBirth.getBirthDefectDesc(); } } } babyEarBirthView.setBirthDefectDesc(birthDefectType); String birthInjuryType = "无"; - if(babyPatientExtendEarBirth.getBirthInjuryType()!=null){ + if (babyPatientExtendEarBirth.getBirthInjuryType() != null) { if (babyPatientExtendEarBirth.getBirthInjuryType() == 1) {//有 birthInjuryType = "有"; - if(StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())){ - birthInjuryType = "有,"+babyPatientExtendEarBirth.getBirthInjuryPosition(); + if (StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())) { + birthInjuryType = "有," + babyPatientExtendEarBirth.getBirthInjuryPosition(); } } } @@ -1589,7 +1607,7 @@ public class BabyEarFacade { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(userId); //获取机构内同一儿童babyIds - List babyIds = getBabyIdsByItemOrg(babyId,hospitalId); + List babyIds = getBabyIdsByItemOrg(babyId, hospitalId); query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); query.setStatus(0); query.setSort("create_date"); @@ -1744,7 +1762,7 @@ public class BabyEarFacade { //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案 //建立隐藏档案 - addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId,"2"); + addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId, "2"); } else { babyPatientExtendEarScreen.setLastUpdateDate(new Date()); babyPatientExtendEarScreen.setLastUpdateUserId(userId + ""); @@ -1891,9 +1909,9 @@ public class BabyEarFacade { } String srcResult = "通过"; - if(earScreen.getScrIspass()!=null){ - if(earScreen.getScrIspass() == 2){//不通过 - srcResult = "未通过"; + if (earScreen.getScrIspass() != null) { + if (earScreen.getScrIspass() == 2) {//不通过 + srcResult = "未通过"; } } screenResult.setSrcResult(srcResult); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitFollowUp.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitFollowUp.java index a68a99a..8cc4bd4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitFollowUp.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitFollowUp.java @@ -15,6 +15,16 @@ public class InitFollowUp extends BaseResponse { private List> confirmResult; //确诊时间 private String confirmData; + //最后一次听诊时间 + private String diagnoseDate; + + public String getDiagnoseDate() { + return diagnoseDate; + } + + public void setDiagnoseDate(String diagnoseDate) { + this.diagnoseDate = diagnoseDate; + } public String getConfirmData() { return confirmData;