diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java index ff3e86d..e8ff8b8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java @@ -18,6 +18,7 @@ public class BabyPatientExtendEarQuery extends BaseQuery private Date createDate; private String createHospitalId; + private String[] createHospitalIds; private Date lastUpdateDate; @@ -51,6 +52,14 @@ public class BabyPatientExtendEarQuery extends BaseQuery //条码 private String barCode; + public String[] getCreateHospitalIds() { + return createHospitalIds; + } + + public void setCreateHospitalIds(String[] createHospitalIds) { + this.createHospitalIds = createHospitalIds; + } + public void setId(String id) { this.id = id; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml index 6aafa37..3504ff6 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml @@ -115,6 +115,13 @@ from baby_patient_extend_ear where id = #{id,jdbcType=VARCHAR} and create_hospital_id = #{createHospitalId,jdbcType=VARCHAR} + + and create_hospital_id in + + #{item} + + + and last_update_date = #{lastUpdateDate,jdbcType=TIMESTAMP} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java index 6fae52c..1b1a105 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java @@ -122,6 +122,61 @@ public enum FmTypeEnums { return null; } + public static List getHdFmEnums() { + List list = new ArrayList<>(); + for (HdFmEnums e : HdFmEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } + return list; + } + public enum HdFmEnums{ + O("顺产", "1"), + O1("早产", "2"), + O2("足月产", "3"), + O3("过期产", "4"), + O4("负压吸引", "5"), + O5("产钳", "6"), + O6("剖宫产", "7"); + + private HdFmEnums(String name,String id) { + this.id = id; + this.name = name; + } + + private String id; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + public static String getHdFmNameById(String id) + { + for (HdFmEnums e : HdFmEnums.values()) { + if (e.getId().equals(id)) + { + return e.getName(); + } + } + return null; + } + public enum FmScEnums { O("自然娩出", "1"), diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java index 7307717..eb5cc19 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java @@ -64,7 +64,7 @@ public class HdEnums { public enum IsConfirmEnums { BY(1, "已确诊"), - WY(2, "待确诊"); + WY(0, "待确诊"); private int id; private String name; 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 34b4fd2..3f25733 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.EnumUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.BabyEarFacade; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; @@ -54,6 +55,8 @@ public class EarController extends BaseController { //获取医院信息 @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private BabyEarFacade babyEarFacade; /** * 检测儿童是否能够随访 @@ -131,7 +134,7 @@ public class EarController extends BaseController { } /** - * 检测儿童是否能够随访 + * 检测儿童是否能够听筛 * * @param babyId 儿童档案id * @return @@ -139,15 +142,29 @@ public class EarController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/checkBabySrccen") @ResponseBody @TokenRequired - public BaseResponse checkBabySrccen(String babyId) { + public BaseResponse checkBabySrccen(String babyId, HttpServletRequest request) { + + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if (loginState == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); + } + if (StringUtils.isEmpty(babyId)) {//传入儿童档案id return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); } + + //查询儿童听力基础信息 //根据babyId查询是否存 BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); earQuery.setBabyPatientId(babyId); + //当前登录人医院Id + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + //获取院内医院集合 + List hospiIds = babyEarFacade.getOrgHospitalIds(hospitalId); + earQuery.setCreateHospitalIds((String[]) hospiIds.toArray(new String[hospiIds.size()])); + List babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); //是否听力建档 if(CollectionUtils.isEmpty(babyPatientExtendEars)){ 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 1cb869e..89c8956 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 @@ -515,12 +515,16 @@ public class FollowUpController extends BaseController { String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); obj.setId(UUID.randomUUID().toString().replace("-", "")); obj.setIfdel(0); - obj.setIfclose(0);//是否结案 + //obj.setIfclose(0);//是否结案 obj.setCreateTime(new Date()); obj.setCreateId(String.valueOf(loginState.getId())); obj.setHospitalId(hospitalId); obj.setEnalble(1); + //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案 + //建立隐藏档案 + babyEarFacade.addhideBabyEar(obj.getBabyId(),hospitalId); + babyPatientExtendEarFollowUpService.addBabyPatientExtendEarFollowUp(obj); BaseResponse result = new BaseResponse(); result.setErrorcode(ErrorCodeConstants.SUCCESS); 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 9bc22f8..b8ca53e 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 @@ -501,9 +501,12 @@ public class HearDiagnManageController extends BaseController { HearDiagnManageListResult hdm = new HearDiagnManageListResult(); hdm.setId(es.getId()); String docotorId = es.getCheckDoctorId(); - Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); - if (users != null) { - hdm.setDoctorName(users.getName() == null ? "-" : users.getName()); + if(StringUtils.isNotEmpty(docotorId)) + { + Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); + if (users != null) { + hdm.setDoctorName(users.getName() == null ? "-" : users.getName()); + } } hdm.setSecrTime(DateUtil.getyyyy_MM_dd(es.getScreenDate())); BabyModel babyModel = babyService.getOneBabyById(es.getBabyId()); @@ -824,7 +827,7 @@ public class HearDiagnManageController extends BaseController { } /** - * 获取听力可疑儿童列表（听力筛查表，当前医院的复诊未通过的数据） + * 获取全部儿童列表（听力筛查表，当前医院的复诊未通过的数据） * * @param request * @return 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 84989a9..f436592 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,8 +369,6 @@ public class HearingDiagnoseController extends BaseController { } } - - scrQuery.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()])); if(scrQuery.getCheckHospitalIds()==null||scrQuery.getCheckHospitalIds().length==0){ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); @@ -739,6 +737,9 @@ public class HearingDiagnoseController extends BaseController { babyEarFacade.showBabyEar(obj.getBabyId()); } } + //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案 + //建立隐藏档案 + babyEarFacade.addhideBabyEar(obj.getBabyId(),hospitalId); BaseResponse result = new BaseResponse(); result.setErrorcode(ErrorCodeConstants.SUCCESS); 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 94b0464..b7ea632 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 @@ -97,7 +97,6 @@ public class BabyEarFacade { private OrganizationGroupsFacade groupsFacade; @Autowired private BabyBookbuildingService babyBookbuildingService; - //处理儿童person信息 private PersonModel handBabyPerson(BabyModel baby) { //跟距母親的證件號查詢兒童person信息 @@ -180,6 +179,7 @@ public class BabyEarFacade { // childrenRecordService.addChildrenRecord(childrenRecord); }*/ + /** * 显示儿童隐藏建档 * @@ -225,6 +225,10 @@ public class BabyEarFacade { */ public boolean addhideBabyEar(String babyId, String hospitalId) { + if(StringUtils.isEmpty(babyId)||StringUtils.isEmpty(hospitalId)){ + return false; + } + BabyModel babyModel = babyService.getOneBabyById(babyId); //隐藏档案儿童Id @@ -258,6 +262,7 @@ public class BabyEarFacade { if (!newBabyId.equals(babyId)) { ear.setId(UUID.randomUUID().toString().replace("-", "")); ear.setBabyPatientId(newBabyId); + ear.setCreateHospitalId(hospitalId); ear.setStatus(YnEnums.NO.getId()); babyPatientExtendEarService.addBabyPatientExtendEar(ear); @@ -1062,7 +1067,7 @@ public class BabyEarFacade { babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight()); babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight()); if (babyPatientExtendEarBirth.getParturitionType() != null) { - String parturitionType = FmTypeEnums.getIdByName(babyPatientExtendEarBirth.getParturitionType()); + String parturitionType = FmTypeEnums.getHdFmNameById(babyPatientExtendEarBirth.getParturitionType()); babyEarBirthView.setParturitionType(parturitionType); } if (babyPatientExtendEarBirth.getAmnioticFluidType() != null) { @@ -1507,12 +1512,16 @@ public class BabyEarFacade { babyPatientExtendEarScreen.setLastUpdateUserId(userId + ""); babyPatientExtendEarScreen.setLastUpdateHospitalId(hId); babyPatientExtendEarScreenService.addBabyPatientExtendEarScreen(babyPatientExtendEarScreen); + //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案 + //建立隐藏档案 + addhideBabyEar(babyPatientExtendEarScreen.getBabyId(),hId); } else { babyPatientExtendEarScreen.setLastUpdateDate(new Date()); babyPatientExtendEarScreen.setLastUpdateUserId(userId + ""); babyPatientExtendEarScreen.setLastUpdateHospitalId(hId); babyPatientExtendEarScreenService.updateBabyPatientExtendEarScreen(babyPatientExtendEarScreen); } + } BaseResponse baseResponse = new BaseResponse(); baseResponse.setObject(babyPatientExtendEarScreen.getId()); @@ -1555,9 +1564,13 @@ public class BabyEarFacade { map.put("liuchan", hospitals); //分娩方式 - List fmType = FmTypeEnums.getFmTypeEnums(); + List fmType = FmTypeEnums.getHdFmEnums(); map.put("fmType", fmType); + // 民族 + List nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID); + map.put("nations", nationResults); + //体验类型 List expType = ExpEnums.getExpEnums(); map.put("expType", expType);