From 089b4cde17f83d074301261cd8a6df09508097dd Mon Sep 17 00:00:00 2001 From: zhangchao Date: Fri, 16 Aug 2024 15:59:10 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=BB=BA=E6=A1=A3?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/Patients.java | 9 ++ .../com/lyms/platform/query/PatientsQuery.java | 14 ++- .../lyms/hospitalapi/dtdyrm/DtdyrmFmService.java | 15 +-- .../operate/web/facade/BookbuildingFacade.java | 124 +++++++++++---------- .../operate/web/facade/MatDeliverFacade.java | 7 +- .../platform/operate/web/facade/PatientFacade.java | 1 + .../operate/web/facade/PatientServiceFacade.java | 1 + 7 files changed, 101 insertions(+), 70 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 18c4cbb..79a5501 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -524,7 +524,16 @@ public class Patients extends BaseModel { private Integer isArchive; //病历号(住院号) private String blNo; + //大同his同步分娩建档数据 不给护士及门诊展示 住院用 默认为0 + private Integer dtFm; + public Integer getDtFm() { + return dtFm; + } + + public void setDtFm(Integer dtFm) { + this.dtFm = dtFm; + } public String getBlNo() { return blNo; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 5ceaed2..8fb9f17 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -448,6 +448,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //病历号(住院号) private String blNo; + //大同his同步分娩建档数据 不给护士及门诊展示 住院用 + private boolean dtFm=false; + + public boolean isDtFm() { + return dtFm; + } + + public void setDtFm(boolean dtFm) { + this.dtFm = dtFm; + } public String getBlNo() { return blNo; @@ -901,7 +911,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition= condition.and("isArchive",0, MongoOper.NE); } - + if (dtFm){ + condition= condition.and("dtFm",0, MongoOper.NE); + } if (extSource != null) { condition = condition.and("source", extSource, MongoOper.EXISTS); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java index c4752ec..c59013f 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java @@ -118,7 +118,7 @@ public class DtdyrmFmService implements IdtdyrmFmService { patient.setBuildType(2); patient.setDueStatus(0); patient.setBlNo(allFm.getBhnum()); - patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); + // patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); patient.setModified(new Date()); patientsService.updatePatientOne(patient,patient.getId()); } else{ @@ -152,10 +152,11 @@ public class DtdyrmFmService implements IdtdyrmFmService { patient.setOperator(users.get(0).getId()); patient.setLastMenses(DateUtil.getWeekDay(allFm.getDue_WEEK().length()>2?-Integer.valueOf(allFm.getDue_WEEK().substring(0,2)):-Integer.valueOf(allFm.getDue_WEEK()))); patient.setBirth(DateUtil.parseYMD(DateUtil.getBirthFromIdCard(allFm.getIdcard()))); - patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); + //patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); patient.setCreated(new Date()); patient.setModified(new Date()); patient.setBlNo(allFm.getBhnum()); + patient.setDtFm(0); patient=patientsService.addPatient(patient); }else { System.out.println("no idCardNo in database："+ allFm.toString()); @@ -300,7 +301,7 @@ public class DtdyrmFmService implements IdtdyrmFmService { for (int i = 0; i < allFm.getFetus_NUM() ; i++) { //儿童 MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby(); - baby.setBabyWeight(allFm.getBaby_WEIGHT() == null ? null : allFm.getBaby_WEIGHT().toString()); + // baby.setBabyWeight(allFm.getBaby_WEIGHT() == null ? null : allFm.getBaby_WEIGHT().toString()); Map as = new HashMap <>(); String pf1 = String.valueOf(allFm.getBaby_APGAR_SCORE_ONE()); String pf5 = String.valueOf(allFm.getBaby_APGAR_SCORE_FIVE()); @@ -318,8 +319,8 @@ public class DtdyrmFmService implements IdtdyrmFmService { baby.setApgarScore(as); baby.setBabyGender("男".equals(allFm.getBaby_SEX().trim()) ? "1" : "0"); - String babyHeight = String.valueOf(allFm.getBaby_HEIGHT()); - String babyWeight = String.valueOf(allFm.getBaby_WEIGHT()); + String babyHeight = String.valueOf(allFm.getBaby_HEIGHT()).trim(); + String babyWeight = String.valueOf(allFm.getBaby_WEIGHT()).trim(); Integer baby_Asphyxiam = allFm.getBaby_ASPHYXIAM(); if (babyHeight != null) { baby.setBabyHeight(babyHeight);//新生儿生长 @@ -333,13 +334,13 @@ public class DtdyrmFmService implements IdtdyrmFmService { baby.setDeformity((allFm.getBaby_DEFORMITY() != null ? allFm.getBaby_DEFORMITY() : 0)); //畸形 0非畸形 1畸形 - String baby_Pregnancy_Out = allFm.getBaby_PREGNANCY_OUT().trim()=="1"?"活产":""; + String baby_Pregnancy_Out = "1".equals(allFm.getBaby_PREGNANCY_OUT().trim())?"活产":""; if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){ baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局 } // System.out.println("7-------------" + allFm.getBABY_PREGNANCY_OUT() == "1" ? "活产" : ""); - baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局 + //baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局 baby.setDueTime(DateUtil.getyyyy_MM_dd_hms(dueDate));//分娩时间 babies.add(baby); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index d0a26dc..1a57f3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -396,37 +396,38 @@ public class BookbuildingFacade { patient.setScreening(yunRequest.getScreening());//特殊产筛建档 //如果建档医生是空则创建医生 - if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) { - - Integer dockerId = usersService.getUserId(patient.getHospitalId(), yunRequest.getLastCheckEmployeeName().trim()); - if (dockerId != null) { - patient.setLastCheckEmployeeId(String.valueOf(dockerId)); - } else { - if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) { - //准备添加数据 - Users users = new Users(); - users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 - //users.setDeptId(deptId); - users.setOrgId(Integer.valueOf(patient.getHospitalId())); - users.setName(yunRequest.getLastCheckEmployeeName().trim()); - users.setAccount(yunRequest.getLastCheckEmployeeName().trim()); - //users.setPhone(phone); - users.setEnable(1); - // users.setZhiChenId(zhiCId); - users.setPwd(MD5Utils.md5("123456").toUpperCase()); - //users.setRemarks(remarks); - // users.setKsId(ksId); - // users.setPublishId(user.getId()); - // users.setPublishName(user.getName()); - users.setYn(YnEnums.YES.getId()); - users.setModified(new Date()); - users.setCreated(new Date()); - // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); - // user.setDefaultPage(defaultPage); - usersService.addUsers(users); - patient.setLastCheckEmployeeId(String.valueOf(users.getId())); - } + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeId()) || StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) { + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) { + Integer dockerId = usersService.getUserId(patient.getHospitalId(), yunRequest.getLastCheckEmployeeName().trim()); + if (dockerId != null) { + patient.setLastCheckEmployeeId(String.valueOf(dockerId)); + } else { + //准备添加数据 + Users users = new Users(); + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 + //users.setDeptId(deptId); + users.setOrgId(Integer.valueOf(patient.getHospitalId())); + users.setName(yunRequest.getLastCheckEmployeeName().trim()); + users.setAccount(yunRequest.getLastCheckEmployeeName().trim()); + //users.setPhone(phone); + users.setEnable(1); + // users.setZhiChenId(zhiCId); + users.setPwd(MD5Utils.md5("123456").toUpperCase()); + //users.setRemarks(remarks); + // users.setKsId(ksId); + // users.setPublishId(user.getId()); + // users.setPublishName(user.getName()); + users.setYn(YnEnums.YES.getId()); + users.setModified(new Date()); + users.setCreated(new Date()); + // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); + // user.setDefaultPage(defaultPage); + usersService.addUsers(users); + patient.setLastCheckEmployeeId(String.valueOf(users.getId())); + } + }else if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeId())){ + patient.setLastCheckEmployeeId(yunRequest.getLastCheckEmployeeId()); } } @@ -1922,40 +1923,41 @@ public class BookbuildingFacade { }*/ //如果建档医生是空则创建医生 - if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) { - - Integer dockerId = usersService.getUserId(hospitalId, yunRequest.getLastCheckEmployeeName().trim()); - if (dockerId != null) { - patient.setLastCheckEmployeeId(String.valueOf(dockerId)); - } else { - if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) { - //准备添加数据 - Users users = new Users(); - users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 - //users.setDeptId(deptId); - users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId()) ? patient.getHospitalId() : hospitalId)); - users.setName(yunRequest.getLastCheckEmployeeName().trim()); - users.setAccount(yunRequest.getLastCheckEmployeeName().trim()); - //users.setPhone(phone); - users.setEnable(1); - // users.setZhiChenId(zhiCId); - users.setPwd(MD5Utils.md5("123456").toUpperCase()); - //users.setRemarks(remarks); - // users.setKsId(ksId); - // users.setPublishId(user.getId()); - // users.setPublishName(user.getName()); - users.setYn(YnEnums.YES.getId()); - users.setModified(new Date()); - users.setCreated(new Date()); - // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); - // user.setDefaultPage(defaultPage); - usersService.addUsers(users); - patient.setLastCheckEmployeeId(String.valueOf(users.getId())); - } - + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeId()) || StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) { + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())) { + Integer dockerId = usersService.getUserId(hospitalId, yunRequest.getLastCheckEmployeeName().trim()); + if (dockerId != null) { + patient.setLastCheckEmployeeId(String.valueOf(dockerId)); + } else { + //准备添加数据 + Users users = new Users(); + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 + //users.setDeptId(deptId); + users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId()) ? patient.getHospitalId() : hospitalId)); + users.setName(yunRequest.getLastCheckEmployeeName().trim()); + users.setAccount(yunRequest.getLastCheckEmployeeName().trim()); + //users.setPhone(phone); + users.setEnable(1); + // users.setZhiChenId(zhiCId); + users.setPwd(MD5Utils.md5("123456").toUpperCase()); + //users.setRemarks(remarks); + // users.setKsId(ksId); + // users.setPublishId(user.getId()); + // users.setPublishName(user.getName()); + users.setYn(YnEnums.YES.getId()); + users.setModified(new Date()); + users.setCreated(new Date()); + // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); + // user.setDefaultPage(defaultPage); + usersService.addUsers(users); + patient.setLastCheckEmployeeId(String.valueOf(users.getId())); + } + } else if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeId())){ + patient.setLastCheckEmployeeId(yunRequest.getLastCheckEmployeeId()); } } + patient.setOperator(userId); patient.setScreening(yunRequest.getScreening());//特殊产筛建档 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index d5c470c..9990b6b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -230,7 +230,12 @@ public class MatDeliverFacade { return new BaseResponse().setErrormsg("操作进行中，请勿重复操作").setErrorcode(ErrorCodeConstants.DATA_EXIST); } lockMap.put(deliverAddRequest.getParentId(), 1); - String hospitalId = autoMatchFacade.getHospitalId(userId); + //大同特殊处理 如果userId为空 默认为大同 + String hospitalId ="2100002419"; + if (userId!=null){ + hospitalId = autoMatchFacade.getHospitalId(userId); + } + //秦皇岛市山海关人民医院 零时处理 // if (CollectionUtils.isNotEmpty(deliverAddRequest.getBabies()) && "1000000004".equals(hospitalId)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 60f8479..94054c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -3210,6 +3210,7 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setBooksuifangDoctor(patientManagerRequest.getBooksuifangDoctor()); if ("2100002419".equals(hospitalId)){ patientsQuery.setArchive(true); + patientsQuery.setDtFm(true); } //孕产建档管理-初诊医生 是否 条件查询 if(StringUtils.isNotEmpty(patientManagerRequest.getProdDoctor())){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index d57f3bd..fbd8b4a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1617,6 +1617,7 @@ public class PatientServiceFacade { patientsQuery.setLimit(statisticsQueryRequest.getLimit()); if ("2100002419".equals(hospitalId)){ patientsQuery.setArchive(true); + patientsQuery.setDtFm(true); } if (StringUtils.isNotEmpty(statisticsQueryRequest.getDueDate())) { String time = statisticsQueryRequest.getDueDate(); -- 1.8.3.1