diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index d169871..4725254 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -332,6 +332,32 @@ public class AntenatalExaminationFacade { model.setDoctorSign(antExAddRequest.getDoctorSign()); model.setPatientSign(antExAddRequest.getPatientSign()); + //大同特殊处理 + if (antExAddRequest.getDoctorType()!=null && antExAddRequest.getDoctorType()==0){ + //准备添加数据 + Users users = new Users(); + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 + //users.setDeptId(deptId); + users.setOrgId(Integer.valueOf(hospitalId)); + users.setName(antExAddRequest.getCheckDoctor()); + users.setAccount(antExAddRequest.getCheckDoctor()); + //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); + model.setCheckDoctor(String.valueOf(users.getId())); + } + //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { //建立隐藏档案 @@ -766,6 +792,31 @@ public class AntenatalExaminationFacade { } antExChuModel.setOperator(userId); antExChuModel.setHospitalId(hospitalId); + //大同特殊处理 + if (excAddRequest.getDoctorType()!=null && excAddRequest.getDoctorType()==0){ + //准备添加数据 + Users users = new Users(); + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 + //users.setDeptId(deptId); + users.setOrgId(Integer.valueOf(hospitalId)); + users.setName(excAddRequest.getProdDoctor()); + users.setAccount(excAddRequest.getProdDoctor()); + //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); + antExChuModel.setProdDoctor(String.valueOf(users.getId())); + } if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) { antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); antenatalExaminationService.updatePatientAbortion(antExChuModel.getId(), antExChuModel.getAbortionZR(), antExChuModel.getAbortionRG()); 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 493791b..44b19d2 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 @@ -1279,7 +1279,7 @@ public class PatientServiceFacade { //指定医生 jsonObject.put("serDoct", ps.getSerDoct() == null ? "" : ps.getSerDoct()); //开通医生 - jsonObject.put("createUser", ps.getCreateUser() == null ? "" : ps.getCreateUser()); + jsonObject.put("createUser", StringUtils.isNotEmpty(ps.getCreateUser())? ps.getCreateUser():""); //服务状态 jsonObject.put("serStatus", ps.getSerStatus()); jsonObject.put("hospitalId", ps.getHospitalId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 65f9225..b3d3c35 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -196,6 +196,9 @@ public class AntExAddRequest implements IBasicRequestConvert { private String treatOpinion; //指导意见 private String guide; + //产检医生类型 0为没有 1为正常 + private Integer doctorType; //产检 医生 @NotEmpty(message = "产检医生不能为空") private String prodDoctor; @@ -559,6 +561,13 @@ public class AntExcAddRequest implements IBasicRequestConvert { private Integer fuzhurenshen;//是否辅助妊娠 1是 0否 private String fuzhufangshi;//辅助方式 + public Integer getDoctorType() { + return doctorType; + } + + public void setDoctorType(Integer doctorType) { + this.doctorType = doctorType; + } public String getYongyaoshi() { return yongyaoshi;