jiangjiazhi / regional-platform

Commit 36ef15677defc7c2af9cff95ab36f3dd73d9d00f

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 95 additions and 34 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
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/request/AntExAddRequest.java

...	...	@@ -178,6 +178,20 @@
178	178	}
179	179
180	180	/**
	181	+ * 复诊上传患者签名
	182	+ *
	183	+ * @return
	184	+ */
	185	+ @RequestMapping(method = RequestMethod.GET, value = "/antexmanageSign")
	186	+ @ResponseBody
	187	+ @TokenRequired
	188	+ public BaseResponse addOneAntenatalExaminationSign(String patientSign, String id, HttpServletRequest request) {
	189	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	190	+ BaseResponse baseResponse = antenatalExaminationFacade.antexmanageSign(patientSign, id);
	191	+ return baseResponse;
	192	+ }
	193	+
	194	+ /**
181	195	* 增加产前检查(初诊)
182	196	*
183	197	* @param antExcAddRequest

...	...	@@ -322,6 +322,9 @@
322	322	// }
323	323
324	324	AntenatalExaminationModel model = antExAddRequest.convertToDataModel();
	325	+ model.setDoctorSign(antExAddRequest.getDoctorSign());
	326	+ model.setPatientSign(antExAddRequest.getPatientSign());
	327	+
325	328	//表示区域的
326	329	if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
327	330	//建立隐藏档案
...	...	@@ -439,6 +442,23 @@
439	442	}
440	443
441	444	/**
	445	+ * 复诊上传患者签名
	446	+
	447	+ * @Author: 武涛涛
	448	+ * @Date: 2020/12/15 15:12
	449	+ */
	450	+ public BaseResponse antexmanageSign(String patientSign, String id) {
	451	+ AntenatalExaminationModel model = new AntenatalExaminationModel();
	452	+ model.setPatientSign(patientSign);
	453	+ if (StringUtils.isNotEmpty(id)) {
	454	+ antenatalExaminationService.updateOneAnt(model, id);
	455	+ }else {
	456	+ return new BaseResponse().setErrormsg("没有id").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
	457	+ }
	458	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	459	+ }
	460	+
	461	+ /**
442	462	* 复诊数据自动流转
443	463	*
444	464	* @param antExamModel
445	465
446	466
447	467
448	468
...	...	@@ -4073,43 +4093,48 @@
4073	4093	if (CollectionUtils.isNotEmpty(id)) {
4074	4094	score = 0;
4075	4095	for (String i : id) {
4076		- basicConfigQuery.setId(i);
4077		- List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
4078		- if (CollectionUtils.isNotEmpty(basicConfigs)) {
4079		- for (BasicConfig basicConfig : basicConfigs) {
4080		- Map<String, Object> map = new HashMap<>();
4081		- map.put("id", basicConfig.getId());
4082		- map.put("name", basicConfig.getName());
4083		- map.put("code", basicConfig.getCode());
4084		- basicConfigQuery.setId(basicConfig.getParentId());
4085		- List<BasicConfig> basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery);
4086		- if (CollectionUtils.isNotEmpty(basicConfigs2)) {
4087		- for (BasicConfig bc : basicConfigs2) {
4088		- String name = bc.getName();
4089		- if (name.indexOf("黄色") > -1) {
4090		- name = "黄色";
4091		- } else if (name.indexOf("橙色") > -1) {
4092		- name = "橙色";
4093		- } else if (name.indexOf("红色") > -1) {
4094		- name = "红色";
4095		- } else if (name.indexOf("紫色") > -1) {
4096		- name = "紫色";
	4096	+ if(StringUtils.isNotEmpty(i)){
	4097	+ basicConfigQuery.setId(i);
	4098	+ List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
	4099	+ if (CollectionUtils.isNotEmpty(basicConfigs)) {
	4100	+ for (BasicConfig basicConfig : basicConfigs) {
	4101	+ Map<String, Object> map = new HashMap<>();
	4102	+ map.put("id", basicConfig.getId());
	4103	+ map.put("name", basicConfig.getName());
	4104	+ map.put("code", basicConfig.getCode());
	4105	+ basicConfigQuery.setId(basicConfig.getParentId());
	4106	+ List<BasicConfig> basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery);
	4107	+ if (CollectionUtils.isNotEmpty(basicConfigs2)) {
	4108	+ for (BasicConfig bc : basicConfigs2) {
	4109	+ if(StringUtils.isNotEmpty(bc.getName())){
	4110	+ String name = bc.getName();
	4111	+ if (name.indexOf("黄色") > -1) {
	4112	+ name = "黄色";
	4113	+ } else if (name.indexOf("橙色") > -1) {
	4114	+ name = "橙色";
	4115	+ } else if (name.indexOf("红色") > -1) {
	4116	+ name = "红色";
	4117	+ } else if (name.indexOf("紫色") > -1) {
	4118	+ name = "紫色";
	4119	+ }
	4120	+ map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
	4121	+ }
	4122	+
4097	4123	}
4098		- map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
4099	4124	}
4100		- }
4101		- if (StringUtils.isNotEmpty(basicConfig.getCode())) {
4102		- score += NumberUtils.toInt(basicConfig.getCode(), 0);
4103		- }
4104		- if (n) {
4105		- BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
4106		- if (null != basicConfig1) {
4107		- Map<String, Object> map1 = new HashMap<>();
4108		- basicConfig1.replenRisk(map1);
4109		- dat1a.add(map1);
	4125	+ if (StringUtils.isNotEmpty(basicConfig.getCode())) {
	4126	+ score += NumberUtils.toInt(basicConfig.getCode(), 0);
4110	4127	}
	4128	+ if (n) {
	4129	+ BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
	4130	+ if (null != basicConfig1) {
	4131	+ Map<String, Object> map1 = new HashMap<>();
	4132	+ basicConfig1.replenRisk(map1);
	4133	+ dat1a.add(map1);
	4134	+ }
	4135	+ }
	4136	+ data.add(map);
4111	4137	}
4112		- data.add(map);
4113	4138	}
4114	4139	}
4115	4140	}

...	...	@@ -17,7 +17,11 @@
17	17	*/
18	18	@Form
19	19	public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminationModel> {
	20	+ //医生签名
	21	+ private String doctorSign;
20	22
	23	+ //患者签名
	24	+ private String patientSign;
21	25	/**
22	26	* start
23	27	* 遵化需求新增字段
...	...	@@ -998,6 +1002,22 @@
998	1002	this.apolipa = apolipa;
999	1003	}
1000	1004
	1005	+ public String getDoctorSign() {
	1006	+ return doctorSign;
	1007	+ }
	1008	+
	1009	+ public void setDoctorSign(String doctorSign) {
	1010	+ this.doctorSign = doctorSign;
	1011	+ }
	1012	+
	1013	+ public String getPatientSign() {
	1014	+ return patientSign;
	1015	+ }
	1016	+
	1017	+ public void setPatientSign(String patientSign) {
	1018	+ this.patientSign = patientSign;
	1019	+ }
	1020	+
1001	1021	public String getApolipb() {
1002	1022	return apolipb;
1003	1023	}
...	...	@@ -1269,7 +1289,9 @@
1269	1289	examinationModel.setBloodSugar2(bloodSugar2);
1270	1290	examinationModel.setBloodSugar3(bloodSugar3);
1271	1291	examinationModel.setBloodSugar4(bloodSugar4);
1272		- examinationModel.setRiskFactor(JsonUtil.array2JsonString(riskFactor));
	1292	+ if(CollectionUtils.isNotEmpty(riskFactor)){
	1293	+ examinationModel.setRiskFactor(JsonUtil.array2JsonString(riskFactor));
	1294	+ }
1273	1295	examinationModel.setRiskScore(riskScore);
1274	1296	if (CollectionUtils.isNotEmpty(otherRisk)) {
1275	1297	examinationModel.setOtherRisk(JsonUtil.array2JsonString(otherRisk));