diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index 89a6aad..8b648a1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -54,7 +54,7 @@ public class PatientMarkHospServiceFacade { */ public BaseResponse patientMarkHospitalInit() { Map map = new HashMap(); - map.put("makeType",MakeHospitalEnums.getMakeHospital()); + map.put("makeType", MakeHospitalEnums.getMakeHospital()); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map); } @@ -62,6 +62,7 @@ public class PatientMarkHospServiceFacade { /** * 根据id查询一条住院提醒记录 + * * @param id * @return */ @@ -102,6 +103,8 @@ public class PatientMarkHospServiceFacade { ps.setId(UUID.randomUUID().toString().replace("-", "")); ps.setHospitalId(hospitalId); + ps.setBackStatus(1); + ps.setInHospitStatus(1); patientMarkHospitalService.addPatientMarkHospital(ps); BaseResponse baseResponse = new BaseResponse(); @@ -183,53 +186,84 @@ public class PatientMarkHospServiceFacade { else if (patients.getType() == 3) { result.setcDueWeek("已分娩"); } + result.setCardNo(patients.getCardNo()); + result.setPhone(patients.getPhone()); + result.setVcCardNo(patients.getVcCardNo()); result.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); result.setName(patients.getUsername()); + result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } - result.setBackStatus(ps.getBackStatus() == 1 ? "待提醒" : "已提醒"); - result.setBackResult(ps.getBackResult() == 1 ? "成功" : "失败"); - Users users = usersService.getUsers(Integer.parseInt(ps.getBackDoctor())); - if (users != null) { - result.setBackDoctor(users.getName()); - } else { - result.setBackDoctor("产检医生"); + result.setBackStatus(ps.getBackStatus()); + + result.setBackStatusStr(ps.getBackStatus() == 1 ? "待提醒" : "已提醒"); + result.setBackResult(ps.getBackResult()); + if (ps.getBackResult() != null) { + result.setBackResultStr(ps.getBackResult() == 1 ? "成功" : "失败"); + } + if (ps.getBackDoctor() != null) { + Users users = usersService.getUsers(Integer.parseInt(ps.getBackDoctor())); + if (users != null) { + result.setBackDoctor(users.getName()); + } else { + result.setBackDoctor("产检医生"); + } } result.setBackDate(DateUtil.getyyyy_MM_dd(ps.getBackDate())); result.setBackMakeDate(DateUtil.getyyyy_MM_dd(ps.getBackMakeDate())); result.setBackRemark(ps.getBackRemark()); - if(ps.getBackFailure()!=null){ - result.setBackFailure(MakeHospitalEnums.getTitle(ps.getBackFailure())); + if (ps.getBackFailure() != null) { + result.setBackFailure(ps.getBackFailure()); + result.setBackFailureStr(MakeHospitalEnums.getTitle(ps.getBackFailure())); } - result.setInHospitStatus(ps.getInHospitStatus() == 1 ? "待提醒" : "已提醒"); - result.setInHospitResult(ps.getInHospitResult() == 1 ? "成功" : "失败"); - users = usersService.getUsers(Integer.parseInt(ps.getInHospitDoctor())); - if (users != null) { - result.setInHospitDoctor(users.getName()); - } else { - result.setInHospitDoctor("产检医生"); + if (ps.getInHospitStatus() != null) { + result.setInHospitStatus(ps.getInHospitStatus()); + result.setInHospitStatusStr(ps.getInHospitStatus() == 1 ? "待提醒" : "已提醒"); } + if (ps.getInHospitResult() != null) { + result.setInHospitResult(ps.getInHospitResult()); + result.setInHospitResultStr(ps.getInHospitResult() == 1 ? "成功" : "失败"); + + } + if(ps.getInHospitDoctor()!=null){ + Users users = usersService.getUsers(Integer.parseInt(ps.getInHospitDoctor())); + if (users != null) { + result.setInHospitDoctor(users.getName()); + } else { + result.setInHospitDoctor("产检医生"); + } + } + result.setInHospitDate(DateUtil.getyyyy_MM_dd(ps.getInHospitDate())); result.setInHospitMakeDate(DateUtil.getyyyy_MM_dd(ps.getInHospitMakeDate())); result.setInHospitRemark(ps.getInHospitRemark()); - result.setInHospitFailure(MakeHospitalEnums.getTitle(ps.getInHospitFailure())); + if (ps.getInHospitFailure() != null) { + result.setInHospitFailure(ps.getInHospitFailure()); + result.setInHospitFailureStr(MakeHospitalEnums.getTitle(ps.getInHospitFailure())); + } + + if (ps.getHospitStatus() != null) { + result.setConfirmStatus(ps.getHospitStatus()); + result.setConfirmStatusStr(ps.getHospitStatus() == 1 ? "待住院" : "已住院"); + } + result.setConfirmDate(DateUtil.getyyyy_MM_dd(ps.getHospitDate())); + if (ps.getHospitType() != null) { + result.setConfirmType(ps.getHospitType() == 1 ? "分娩住院" : "其他住院"); + } result.setMakeInHospitDate(DateUtil.getyyyy_MM_dd(ps.getMakeInHospitDate())); result.setMakeDate(DateUtil.getyyyy_MM_dd(ps.getMakeDate())); - users = usersService.getUsers(Integer.parseInt(ps.getMakeDoctor())); - if (users != null) { - result.setMakeDoctor(users.getName()); - } else { - result.setMakeDoctor("产检医生"); + if(ps.getMakeDoctor()!=null){ + Users users = usersService.getUsers(Integer.parseInt(ps.getMakeDoctor())); + if (users != null) { + result.setMakeDoctor(users.getName()); + } else { + result.setMakeDoctor("产检医生"); + } } - result.setMakeRemark(ps.getMakeRemark()); + result.setMakeRemark(ps.getMakeRemark()); result.setPatientId(ps.getPatientId()); result.setpId(ps.getPid()); - users = usersService.getUsers(Integer.parseInt(ps.getInHospitDoctor())); - if (users != null) { - result.setInHospitDoctor(users.getName()); - } else { - result.setInHospitDoctor("产检医生"); - } + return result; } @@ -308,7 +342,7 @@ public class PatientMarkHospServiceFacade { /** * 同步查询乐陵住院数据 */ - public void synLlHisData(int offset,int page){ + public void synLlHisData(int offset, int page) { PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery(); patientMarkHospQuery.setSort("hospit_date"); @@ -319,32 +353,33 @@ public class PatientMarkHospServiceFacade { List patientMarkHospitals = patientMarkHospitalService.queryPatientMarkHospital(patientMarkHospQuery); for (PatientMarkHospital ps : patientMarkHospitals) { - if(ps.getHospitType() == 1){//分娩住院跳过 + if (ps.getHospitType() == 1) {//分娩住院跳过 continue; } synUpdateHisData(ps); } - if(patientMarkHospQuery.getCount()>page*100){ - synLlHisData((page+1)*100,page+1); + if (patientMarkHospQuery.getCount() > page * 100) { + synLlHisData((page + 1) * 100, page + 1); } } /** * 同步更新数据库 + * * @param ps */ - public void synUpdateHisData(PatientMarkHospital ps){ + public void synUpdateHisData(PatientMarkHospital ps) { Patients patients = patientsService.findOnePatientById(ps.getPatientId()); if (null != patients) { - List> makePatients = llfyHisService.getPatientInfo(patients,DateUtil.getyyyy_MM_dd(ps.getMakeDate()),DateUtil.getyyyy_MM_dd(new Date())); - if(CollectionUtils.isNotEmpty(makePatients)){ - for(Map map : makePatients){ + List> makePatients = llfyHisService.getPatientInfo(patients, DateUtil.getyyyy_MM_dd(ps.getMakeDate()), DateUtil.getyyyy_MM_dd(new Date())); + if (CollectionUtils.isNotEmpty(makePatients)) { + for (Map map : makePatients) { String inHospDiagn = map.get("inHospDiagn"); int hospType = getHospitType(inHospDiagn); ps.setHospitStatus(2); - if(ps.getHospitStatus()==null){ + if (ps.getHospitStatus() == null) { ps.setHospitType(hospType); - }else if(hospType==1){//当住院方式为分娩方式时 + } else if (hospType == 1) {//当住院方式为分娩方式时 ps.setHospitType(hospType); } } @@ -355,6 +390,7 @@ public class PatientMarkHospServiceFacade { /** * 根据入院诊断返回入院方式 + * * @param intHospDesc 入院诊断编码 * @return */ @@ -444,9 +480,9 @@ public class PatientMarkHospServiceFacade { map.put("ysydwr", 1); map.put("zyxye", 1); Integer hospType = map.get(intHospDesc); - if(hospType==null){ + if (hospType == null) { return 2; - }else { + } else { return 1; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java index 67b60e8..0ea34d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java @@ -21,6 +21,18 @@ public class PatienMarkHospResult { private String name; /** + * 就诊卡号 + */ + private String vcCardNo; + /** + * 身份证号 + */ + private String cardNo; + /** + * 手机号 + */ + private String phone; + /** * 孕妇年龄 */ private String age; @@ -28,15 +40,22 @@ public class PatienMarkHospResult { * 当前孕周 */ private String cDueWeek; + /** + * 预产期 + */ + private String dueDate; /** * 回院是否提醒（1-待提醒、2-已提醒） */ - private String backStatus; + private Integer backStatus; + private String backStatusStr; /** * 回院提醒结果（1-成功、2-失败） */ - private String backResult; + private Integer backResult; + private String backResultStr; + /** * 回院操作员id */ @@ -56,15 +75,18 @@ public class PatienMarkHospResult { /** * 回院失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他） */ - private String backFailure; + private Integer backFailure; + private String backFailureStr; /** * 住院是否提醒（1-待提醒、2-已提醒） */ - private String inHospitStatus; + private Integer inHospitStatus; + private String inHospitStatusStr; /** * 住院提醒结果（1-成功、2-失败） */ - private String inHospitResult; + private Integer inHospitResult; + private String inHospitResultStr; /** * 住院操作员id */ @@ -84,7 +106,8 @@ public class PatienMarkHospResult { /** * 住院失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他）2 */ - private String inHospitFailure; + private Integer inHospitFailure; + private String inHospitFailureStr; /** * 预约住院时间（初始录入） */ @@ -102,9 +125,10 @@ public class PatienMarkHospResult { */ private String makeRemark; /** - * 住院状态 + * 住院状态 1-待住院、2-已住院 */ - private String confirmStatus; + private Integer confirmStatus; + private String confirmStatusStr; /** * 住院时间 */ @@ -114,34 +138,11 @@ public class PatienMarkHospResult { */ private String confirmType; - public String getConfirmStatus() { - return confirmStatus; - } - - public void setConfirmStatus(String confirmStatus) { - this.confirmStatus = confirmStatus; - } - - public String getConfirmDate() { - return confirmDate; - } - - public void setConfirmDate(String confirmDate) { - this.confirmDate = confirmDate; - } - - public String getConfirmType() { - return confirmType; - } - - public void setConfirmType(String confirmType) { - this.confirmType = confirmType; - } - public String getId() { return id; } + public void setId(String id) { this.id = id; } @@ -186,22 +187,38 @@ public class PatienMarkHospResult { this.cDueWeek = cDueWeek; } - public String getBackStatus() { + public Integer getBackStatus() { return backStatus; } - public void setBackStatus(String backStatus) { + public void setBackStatus(Integer backStatus) { this.backStatus = backStatus; } - public String getBackResult() { + public String getBackStatusStr() { + return backStatusStr; + } + + public void setBackStatusStr(String backStatusStr) { + this.backStatusStr = backStatusStr; + } + + public Integer getBackResult() { return backResult; } - public void setBackResult(String backResult) { + public void setBackResult(Integer backResult) { this.backResult = backResult; } + public String getBackResultStr() { + return backResultStr; + } + + public void setBackResultStr(String backResultStr) { + this.backResultStr = backResultStr; + } + public String getBackDoctor() { return backDoctor; } @@ -234,30 +251,54 @@ public class PatienMarkHospResult { this.backRemark = backRemark; } - public String getBackFailure() { + public Integer getBackFailure() { return backFailure; } - public void setBackFailure(String backFailure) { + public void setBackFailure(Integer backFailure) { this.backFailure = backFailure; } - public String getInHospitStatus() { + public String getBackFailureStr() { + return backFailureStr; + } + + public void setBackFailureStr(String backFailureStr) { + this.backFailureStr = backFailureStr; + } + + public Integer getInHospitStatus() { return inHospitStatus; } - public void setInHospitStatus(String inHospitStatus) { + public void setInHospitStatus(Integer inHospitStatus) { this.inHospitStatus = inHospitStatus; } - public String getInHospitResult() { + public String getInHospitStatusStr() { + return inHospitStatusStr; + } + + public void setInHospitStatusStr(String inHospitStatusStr) { + this.inHospitStatusStr = inHospitStatusStr; + } + + public Integer getInHospitResult() { return inHospitResult; } - public void setInHospitResult(String inHospitResult) { + public void setInHospitResult(Integer inHospitResult) { this.inHospitResult = inHospitResult; } + public String getInHospitResultStr() { + return inHospitResultStr; + } + + public void setInHospitResultStr(String inHospitResultStr) { + this.inHospitResultStr = inHospitResultStr; + } + public String getInHospitDoctor() { return inHospitDoctor; } @@ -290,14 +331,22 @@ public class PatienMarkHospResult { this.inHospitRemark = inHospitRemark; } - public String getInHospitFailure() { + public Integer getInHospitFailure() { return inHospitFailure; } - public void setInHospitFailure(String inHospitFailure) { + public void setInHospitFailure(Integer inHospitFailure) { this.inHospitFailure = inHospitFailure; } + public String getInHospitFailureStr() { + return inHospitFailureStr; + } + + public void setInHospitFailureStr(String inHospitFailureStr) { + this.inHospitFailureStr = inHospitFailureStr; + } + public String getMakeInHospitDate() { return makeInHospitDate; } @@ -329,4 +378,69 @@ public class PatienMarkHospResult { public void setMakeRemark(String makeRemark) { this.makeRemark = makeRemark; } + + public Integer getConfirmStatus() { + return confirmStatus; + } + + public void setConfirmStatus(Integer confirmStatus) { + this.confirmStatus = confirmStatus; + } + + public String getConfirmStatusStr() { + return confirmStatusStr; + } + + public void setConfirmStatusStr(String confirmStatusStr) { + this.confirmStatusStr = confirmStatusStr; + } + + public String getConfirmDate() { + return confirmDate; + } + + public void setConfirmDate(String confirmDate) { + this.confirmDate = confirmDate; + } + + public String getConfirmType() { + return confirmType; + } + + public void setConfirmType(String confirmType) { + this.confirmType = confirmType; + } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + }