jiangjiazhi / regional-platform

Commit 902308dd3f9f9aa909e9e25ed5121f465d1df23f

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

大同三打印

Showing 8 changed files with 158 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.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/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.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/result/AntenatalExaminationResult.java

...	...	@@ -362,6 +362,18 @@
362	362	private String ndbSelectOtherVal;
363	363
364	364
	365	+ //羊水量
	366	+ private String bamnio;
	367	+
	368	+ public String getBamnio() {
	369	+ return bamnio;
	370	+ }
	371	+
	372	+ public void setBamnio(String bamnio) {
	373	+ this.bamnio = bamnio;
	374	+ }
	375	+
	376	+
365	377	public String getSecondaryDiagnosisId() {
366	378	return secondaryDiagnosisId;
367	379	}

...	...	@@ -132,7 +132,9 @@
132	132	// else
133	133	// {
134	134	//计划发送时间
135		- String sendStr = sendTime == null ? DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + sendTime +":00" : (DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + sendTime +":00");
	135	+ String sendStr = sendTime == null ?
	136	+ DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + ConfigInterface.SEND_TIME +":00" :
	137	+ (DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + sendTime +":00");
136	138	request.setPlanTime(sendStr);
137	139	// }
138	140

...	...	@@ -752,6 +752,22 @@
752	752	return viewFacade.findAntenatalExamination(id);
753	753	}
754	754
	755	+
	756	+ /**
	757	+ * 大同打印复诊
	758	+ * @param id
	759	+ * @param request
	760	+ * @return
	761	+ */
	762	+ @RequestMapping(value = "/findDtAntenatalExaminationData", method = RequestMethod.GET)
	763	+ @ResponseBody
	764	+ @TokenRequired
	765	+ public BaseObjectResponse findDtAntenatalExaminationData(@RequestParam("id") String id,
	766	+ HttpServletRequest request) {
	767	+
	768	+ return viewFacade.findDtAntenatalExaminationData(id);
	769	+ }
	770	+
755	771	@RequestMapping(value = "/findAntenatalExaminationInfo", method = RequestMethod.GET)
756	772	@ResponseBody
757	773	public BaseObjectResponse findAntenatalExaminationInfo(@RequestParam("cardNo") String cardNo) {

...	...	@@ -3215,7 +3215,6 @@
3215	3215	}
3216	3216	Patients patients = null;
3217	3217	List<Patients> list = patientsService.queryPatient1(patientsQuery, "created");
3218		- System.out.println("分娩查询" + patientsQuery.convertToQuery().convertToMongoQuery().toString());
3219	3218	if (CollectionUtils.isNotEmpty(list)) {
3220	3219	for(Patients pat : list) {
3221	3220	if (StringUtils.isEmpty(pat.getSource()))

...	...	@@ -2450,9 +2450,9 @@
2450	2450	patientsQuery.setSort("fmDate");
2451	2451
2452	2452
2453		- System.out.println("分娩档案查询" + patientsQuery.convertToQuery().convertToMongoQuery().toString());
	2453	+ //System.out.println("分娩档案查询" + patientsQuery.convertToQuery().convertToMongoQuery().toString());
2454	2454	List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
2455		- System.out.println("分娩档案查询结束" + patientsQuery.convertToQuery().convertToMongoQuery().toString());
	2455	+ //System.out.println("分娩档案查询结束" + patientsQuery.convertToQuery().convertToMongoQuery().toString());
2456	2456
2457	2457	// 这里就设置分页内容
2458	2458	childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
2459	2459
2460	2460
2461	2461
...	...	@@ -2542,15 +2542,11 @@
2542	2542	matDeliverQuery.setPage(childbirthManagerRequest.getPage());
2543	2543	matDeliverQuery.setNeed("need");
2544	2544
2545		- System.out.println("分娩查询" + matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2546	2545	maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2547		- System.out.println("分娩查询结束" + matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2548	2546	// 这里就设置分页内容
2549	2547	childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
2550	2548	} else {//否则按常规查询
2551		- System.out.println("分娩查询1" + matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2552	2549	maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
2553		- System.out.println("分娩查询结束1" + matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2554	2550	}
2555	2551
2556	2552	Map <String, Patients> patientsMap = new HashedMap();

...	...	@@ -7844,6 +7844,9 @@
7844	7844	map.put("liveAddress", CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
7845	7845	null, null, null, basicConfigService));
7846	7846
	7847	+ map.put("registAddress", CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
	7848	+ null, null, null, basicConfigService));
	7849	+
7847	7850	map.put("buildDate", DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
7848	7851	map.put("phone", patients.getPhone() == null ? "" : patients.getPhone());
7849	7852	map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName());
...	...	@@ -7916,6 +7919,103 @@
7916	7919	map.put("zs", data.getDiagnosisOther());
7917	7920	map.put("checkResult", data.getCheckResult());
7918	7921	map.put("diagnosis",data.getSecondaryDiagnosis());
	7922	+
	7923	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);
	7924	+ }
	7925	+
	7926	+ public BaseObjectResponse findDtAntenatalExaminationData(String id) {
	7927	+
	7928	+ BaseObjectResponse br = new BaseObjectResponse();
	7929	+ if (org.apache.commons.lang.StringUtils.isEmpty(id)) {
	7930	+ br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	7931	+ br.setErrormsg("id为空");
	7932	+ return br;
	7933	+ }
	7934	+
	7935	+ AntenatalExaminationModel data = antExService.findOneById(id);
	7936	+ if (data == null \|\| data.getYn() == YnEnums.NO.getId()) {
	7937	+ br.setErrorcode(ErrorCodeConstants.NO_DATA);
	7938	+ br.setErrormsg("没有查询到数据");
	7939	+ return br;
	7940	+ }
	7941	+
	7942	+
	7943	+ Patients patients = patientsService.findOnePatientById(data.getParentId());
	7944	+ if (patients == null \|\| patients.getYn() == YnEnums.NO.getId()) {
	7945	+ br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	7946	+ br.setErrormsg("孕妇信息不存在");
	7947	+ return br;
	7948	+ }
	7949	+
	7950	+ Map<String, Object> map = new LinkedHashMap<>();
	7951	+
	7952	+
	7953	+ //产检基本信息
	7954	+ map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate()));
	7955	+ map.put("checkWeek", DateUtil.getWeekDesc(patients.getLastMenses(),data.getCheckDate()));
	7956	+ // 血压
	7957	+ String ssy = "";
	7958	+ String szy = "";
	7959	+ Map<String, String> chBpMap = JsonUtil.getMap(data.getBp());
	7960	+ if (MapUtils.isNotEmpty(chBpMap)) {
	7961	+ ssy = chBpMap.get("ssy");
	7962	+ szy = chBpMap.get("szy");
	7963	+ }
	7964	+ map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG));
	7965	+ map.put("weight", data.getWeight());
	7966	+ map.put("urineProtein", data.getUrineProtein()); //尿蛋白
	7967	+ map.put("hemoglobin", data.getHemoglobin()); //血红蛋白
	7968	+ String edema = "";
	7969	+ if (StringUtils.isNotEmpty(data.getEdema())) {
	7970	+ for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
	7971	+ if (data.getEdema().equals(fuZhongEnums.getId())) {
	7972	+ edema = fuZhongEnums.getName();
	7973	+ }
	7974	+ }
	7975	+ }
	7976	+ map.put("edema", edema);//浮肿
	7977	+ String gongGao = "";
	7978	+ if (StringUtils.isNotEmpty(data.getGongGaoSelect())) {
	7979	+ if (StringUtils.isNotEmpty(data.getGongGaoType())) {
	7980	+ gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(data.getGongGaoType());
	7981	+ } else {
	7982	+ gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect());
	7983	+ }
	7984	+ } else if (StringUtils.isNotEmpty(data.getGongGao())) {
	7985	+ gongGao = UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM);
	7986	+ }
	7987	+
	7988	+ map.put("gf", gongGao+(data.getAbdominalCircumference() == null ? "" : "/"+data.getAbdominalCircumference()));
	7989	+ //胎儿情况
	7990	+ String heartRate = "";
	7991	+ String fetalPosition = "";
	7992	+ String fetalPresentation = "";
	7993	+ if (CollectionUtils.isNotEmpty(data.getTireData())) {
	7994	+ for (Object temp : data.getTireData()) {
	7995	+ Map<String, Object> tire = (Map<String, Object>) temp;
	7996	+ if (tire != null) {
	7997	+ heartRate = tire.get("heartRate") == null ? "" : String.valueOf(tire.get("heartRate"));
	7998	+ fetalPosition = tire.get("fetalPosition") == null ? "" : String.valueOf(tire.get("fetalPosition"));
	7999	+ fetalPresentation = tire.get("fetalPresentation") == null ? "" : String.valueOf(tire.get("fetalPresentation"));
	8000	+ }
	8001	+ }
	8002	+ }
	8003	+
	8004	+ map.put("fetalPosition", fetalPosition);//胎方位
	8005	+ map.put("heartRate", heartRate);//胎心
	8006	+ map.put("fetalPresentation", fetalPresentation); //先露
	8007	+ map.put("bamnio", data.getBamnio());// 羊水
	8008	+
	8009	+
	8010	+ map.put("handle",data.getSecondaryDiagnosis());//处置
	8011	+ String checkDoctor = "";
	8012	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getCheckDoctor())) {
	8013	+ Users users = usersService.getUsers(Integer.parseInt(data.getCheckDoctor()));
	8014	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	8015	+ checkDoctor = users.getName();
	8016	+ }
	8017	+ }
	8018	+ map.put("checkDoctor", checkDoctor);
7919	8019
7920	8020	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);
7921	8021	}

...	...	@@ -347,7 +347,17 @@
347	347
348	348	private Integer screeningState;
349	349
	350	+ //羊水量
	351	+ private String bamnio;
350	352
	353	+ public String getBamnio() {
	354	+ return bamnio;
	355	+ }
	356	+
	357	+ public void setBamnio(String bamnio) {
	358	+ this.bamnio = bamnio;
	359	+ }
	360	+
351	361	public List<String> getSecondaryDiagnosisId() {
352	362	return secondaryDiagnosisId;
353	363	}
...	...	@@ -1364,6 +1374,9 @@
1364	1374	if (StringUtils.isNotEmpty(ndbSelectOtherVal)) {
1365	1375	examinationModel.setNdbSelectOtherVal(ndbSelectOtherVal);
1366	1376	}
	1377	+ examinationModel.setBamnio(bamnio);
	1378	+
	1379	+
1367	1380
1368	1381	return examinationModel;
1369	1382	}

...	...	@@ -111,6 +111,17 @@
111	111	*/
112	112	private String ndbSelectOtherVal;
113	113
	114	+ //羊水量
	115	+ private String bamnio;
	116	+
	117	+ public String getBamnio() {
	118	+ return bamnio;
	119	+ }
	120	+
	121	+ public void setBamnio(String bamnio) {
	122	+ this.bamnio = bamnio;
	123	+ }
	124	+
114	125	public String getFuweiSelect() {
115	126	return fuweiSelect;
116	127	}
...	...	@@ -1228,6 +1239,7 @@
1228	1239	setXnsd(destModel.getXnsd());
1229	1240	setSyjg(destModel.getSyjg());
1230	1241	setHivkt(destModel.getHivkt());
	1242	+ setBamnio(destModel.getBamnio());
1231	1243
1232	1244	return this;
1233	1245	}