jiangjiazhi / regional-platform

Commit 5258b49d331c2ac73ea59c3bddcc3db7efd46b56

Authored by zhangchao about 1 year ago

Exists in dev

#fix:产检页面新增产检医生手动处理逻辑

Showing 4 changed files with 72 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java

...	...	@@ -332,6 +332,32 @@
332	332	model.setDoctorSign(antExAddRequest.getDoctorSign());
333	333	model.setPatientSign(antExAddRequest.getPatientSign());
334	334
	335	+ //大同特殊处理
	336	+ if (antExAddRequest.getDoctorType()!=null && antExAddRequest.getDoctorType()==0){
	337	+ //准备添加数据
	338	+ Users users = new Users();
	339	+ users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户
	340	+ //users.setDeptId(deptId);
	341	+ users.setOrgId(Integer.valueOf(hospitalId));
	342	+ users.setName(antExAddRequest.getCheckDoctor());
	343	+ users.setAccount(antExAddRequest.getCheckDoctor());
	344	+ //users.setPhone(phone);
	345	+ users.setEnable(1);
	346	+ // users.setZhiChenId(zhiCId);
	347	+ users.setPwd(MD5Utils.md5("123456").toUpperCase());
	348	+ //users.setRemarks(remarks);
	349	+ // users.setKsId(ksId);
	350	+ // users.setPublishId(user.getId());
	351	+ // users.setPublishName(user.getName());
	352	+ users.setYn(YnEnums.YES.getId());
	353	+ users.setModified(new Date());
	354	+ users.setCreated(new Date());
	355	+ // users.setZhiChen(ZhiChenEnums.getById(zhiCId));
	356	+ // user.setDefaultPage(defaultPage);
	357	+ usersService.addUsers(users);
	358	+ model.setCheckDoctor(String.valueOf(users.getId()));
	359	+ }
	360	+
335	361	//表示区域的
336	362	if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
337	363	//建立隐藏档案
...	...	@@ -766,6 +792,31 @@
766	792	}
767	793	antExChuModel.setOperator(userId);
768	794	antExChuModel.setHospitalId(hospitalId);
	795	+ //大同特殊处理
	796	+ if (excAddRequest.getDoctorType()!=null && excAddRequest.getDoctorType()==0){
	797	+ //准备添加数据
	798	+ Users users = new Users();
	799	+ users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户
	800	+ //users.setDeptId(deptId);
	801	+ users.setOrgId(Integer.valueOf(hospitalId));
	802	+ users.setName(excAddRequest.getProdDoctor());
	803	+ users.setAccount(excAddRequest.getProdDoctor());
	804	+ //users.setPhone(phone);
	805	+ users.setEnable(1);
	806	+ // users.setZhiChenId(zhiCId);
	807	+ users.setPwd(MD5Utils.md5("123456").toUpperCase());
	808	+ //users.setRemarks(remarks);
	809	+ // users.setKsId(ksId);
	810	+ // users.setPublishId(user.getId());
	811	+ // users.setPublishName(user.getName());
	812	+ users.setYn(YnEnums.YES.getId());
	813	+ users.setModified(new Date());
	814	+ users.setCreated(new Date());
	815	+ // users.setZhiChen(ZhiChenEnums.getById(zhiCId));
	816	+ // user.setDefaultPage(defaultPage);
	817	+ usersService.addUsers(users);
	818	+ antExChuModel.setProdDoctor(String.valueOf(users.getId()));
	819	+ }
769	820	if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) {
770	821	antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId());
771	822	antenatalExaminationService.updatePatientAbortion(antExChuModel.getId(), antExChuModel.getAbortionZR(), antExChuModel.getAbortionRG());

...	...	@@ -1279,7 +1279,7 @@
1279	1279	//指定医生
1280	1280	jsonObject.put("serDoct", ps.getSerDoct() == null ? "" : ps.getSerDoct());
1281	1281	//开通医生
1282		- jsonObject.put("createUser", ps.getCreateUser() == null ? "" : ps.getCreateUser());
	1282	+ jsonObject.put("createUser", StringUtils.isNotEmpty(ps.getCreateUser())? ps.getCreateUser():"");
1283	1283	//服务状态
1284	1284	jsonObject.put("serStatus", ps.getSerStatus());
1285	1285	jsonObject.put("hospitalId", ps.getHospitalId());

...	...	@@ -196,6 +196,9 @@
196	196	private String treatmentOpinion;
197	197	//指导
198	198	private String guide;
	199	+ //产检医生类型 0为没有 1为正常
	200	+ private Integer doctorType;
	201	+
199	202	//产检医生
200	203	@NotEmpty(message = "产检医生不能为空")
201	204	private String checkDoctor;
...	...	@@ -432,6 +435,14 @@
432	435
433	436	private String height;
434	437	private String yqWeight;
	438	+
	439	+ public Integer getDoctorType() {
	440	+ return doctorType;
	441	+ }
	442	+
	443	+ public void setDoctorType(Integer doctorType) {
	444	+ this.doctorType = doctorType;
	445	+ }
435	446
436	447	public String getYqWeight() {
437	448	return yqWeight;

...	...	@@ -238,6 +238,8 @@
238	238	private String treatOpinion;
239	239	//指导意见
240	240	private String guide;
	241	+ //产检医生类型 0为没有 1为正常
	242	+ private Integer doctorType;
241	243	//产检医生
242	244	@NotEmpty(message = "产检医生不能为空")
243	245	private String prodDoctor;
...	...	@@ -559,6 +561,13 @@
559	561	private Integer fuzhurenshen;//是否辅助妊娠 1是 0否
560	562	private String fuzhufangshi;//辅助方式
561	563
	564	+ public Integer getDoctorType() {
	565	+ return doctorType;
	566	+ }
	567	+
	568	+ public void setDoctorType(Integer doctorType) {
	569	+ this.doctorType = doctorType;
	570	+ }
562	571
563	572	public String getYongyaoshi() {
564	573	return yongyaoshi;