jiangjiazhi / regional-platform

Commit b5e64fc022214065c8ee339990c7f20cb0a3b0b4

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.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/BookbuildingFacade.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/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java

1	1	package com.lyms.platform.common.enums;
2	2
3		-import com.lyms.platform.common.utils.StringUtils;
4		-
5	3	/**
6	4	* 纠正依据
7	5	*/
8	6
...	...	@@ -19,16 +17,13 @@
19	17
20	18
21	19	public static String getName(String id) {
22		- if(StringUtils.isEmpty(id)) {
23		- return null;
24		- }
25	20	BasisEnums[] values = BasisEnums.values();
26	21	for (BasisEnums value : values) {
27	22	if (value.getId().equals(id)) {
28	23	return value.getName();
29	24	}
30	25	}
31		- return null;
	26	+ return "";
32	27	}
33	28	private String id;
34	29	private String name;

...	...	@@ -17,8 +17,8 @@
17	17	private static final long serialVersionUID = SerialIdEnum.Patients.getCid();
18	18
19	19
20		- // 纠正末次月经
21		- private String fuckLastMens;
	20	+ // 纠正末次月经 (和末次月经反起存)
	21	+ private Date fuckLastMens;
22	22	// 末次月经纠正依据
23	23	private String lastMenstrualPeriodBasis;
24	24	// 末次月经纠正依据
...	...	@@ -28,7 +28,7 @@
28	28	// 末次月经纠正时间
29	29	private String lastMenstrualPeriodBasisDate;
30	30
31		- public String getFuckLastMens() {
	31	+ public Date getFuckLastMens() {
32	32	return fuckLastMens;
33	33	}
34	34
...	...	@@ -40,7 +40,7 @@
40	40	this.lastMenstrualPeriodBasisOther = lastMenstrualPeriodBasisOther;
41	41	}
42	42
43		- public void setFuckLastMens(String fuckLastMens) {
	43	+ public void setFuckLastMens(Date fuckLastMens) {
44	44	this.fuckLastMens = fuckLastMens;
45	45	}
46	46

...	...	@@ -35,23 +35,23 @@
35	35
36	36
37	37	/**
38		- * 获取数据是否打印过
39		- * type = 1 初诊
40		- * type = 2 复诊
	38	+ * 获取是否打印过
41	39	*/
42	40	@RequestMapping(value = "/get/prient", method = RequestMethod.GET)
43	41	@ResponseBody
	42	+ @TokenRequired
44	43	public BaseObjectResponse getIsPrient(@RequestParam String id) {
45	44	return viewFacade.getIsPrient(id);
46	45	}
47	46
48	47	/**
49		- * 初诊复诊打印后回调controller
	48	+ * 打印后回调controller
50	49	* type = 1 初诊
51	50	* type = 2 复诊
52	51	*/
53	52	@RequestMapping(value = "/prient", method = RequestMethod.GET)
54	53	@ResponseBody
	54	+ @TokenRequired
55	55	public BaseObjectResponse prient(@RequestParam String id) {
56	56	return viewFacade.prient(id);
57	57	}

...	...	@@ -33,6 +33,7 @@
33	33	import org.slf4j.LoggerFactory;
34	34	import org.springframework.beans.factory.annotation.Autowired;
35	35	import org.springframework.data.domain.Sort;
	36	+import org.springframework.data.mongodb.core.MongoTemplate;
36	37	import org.springframework.stereotype.Component;
37	38
38	39	import javax.servlet.http.HttpServletResponse;
...	...	@@ -103,7 +104,6 @@
103	104	@Autowired
104	105	private CouponMapper couponMapper;
105	106
106		-
107	107	@Autowired
108	108	private DeleteProcessHandler deleteProcessHandler;
109	109
...	...	@@ -1102,6 +1102,16 @@
1102	1102	public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
1103	1103	Patients patient = new Patients();
1104	1104
	1105	+
	1106	+ // 纠正末次月经和末次月经反起存
	1107	+ if(StringUtils.isEmpty(yunRequest.getFuckLastMens())) {
	1108	+ patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
	1109	+ } else {
	1110	+ patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
	1111	+ patient.setLastMenses(DateUtil.parseYMD(yunRequest.getFuckLastMens()));
	1112	+ }
	1113	+ patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
	1114	+
1105	1115	patient.setLastMenstrualPeriodBasis(yunRequest.getLastMenstrualPeriodBasis());
1106	1116	patient.setLastMenstrualPeriodBasisDoctorId(yunRequest.getLastMenstrualPeriodBasisDoctorId());
1107	1117	patient.setLastMenstrualPeriodBasisDate(yunRequest.getLastMenstrualPeriodBasisDate());
...	...	@@ -1206,7 +1216,9 @@
1206	1216	patient.setExpVip(yunRequest.getExpVip());
1207	1217	patient.setMremark(yunRequest.getMremark());
1208	1218
1209		- patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
	1219	+// patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
	1220	+
	1221	+
1210	1222	patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate()));
1211	1223	patient.setFileCode(yunRequest.getFileCode());
1212	1224	patient.setBookbuildingDoctor(yunRequest.getBookbuildingDoctor());
1213	1225
...	...	@@ -1249,11 +1261,13 @@
1249	1261	public PregnantInfoResult getResult(Patients p) {
1250	1262	PregnantInfoResult result = new PregnantInfoResult();
1251	1263
1252		-
1253		- result.setLastMenstrualPeriodBasis(p.getLastMenstrualPeriodBasis());
1254		- result.setLastMenstrualPeriodBasisDoctorId(couponMapper.getUserName(p.getLastMenstrualPeriodBasisDoctorId()));
	1264	+ result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getFuckLastMens()));
	1265	+ result.setLastMenstrualPeriodBasis(BasisEnums.getName(p.getLastMenstrualPeriodBasis()));
	1266	+ result.setLastMenstrualPeriodBasisId(p.getLastMenstrualPeriodBasis());
	1267	+ result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther());
	1268	+ result.setLastMenstrualPeriodBasisDoctorId(p.getLastMenstrualPeriodBasisDoctorId());
	1269	+ result.setLastMenstrualPeriodBasisDoctorName(couponMapper.getUserName(p.getLastMenstrualPeriodBasisDoctorId()));
1255	1270	result.setLastMenstrualPeriodBasisDate(p.getLastMenstrualPeriodBasisDate());
1256		-
1257	1271
1258	1272	result.setMensStartDay(p.getMensStartDay());
1259	1273	result.setMensEndDay(p.getMensEndDay());

...	...	@@ -3707,7 +3707,7 @@
3707	3707
3708	3708	public BaseObjectResponse prient(String id) {
3709	3709	if(mongoTemplate.exists(Query.query(Criteria.where("value").is(id).and("type").is(SequenceConstant.PRIENT_TYPE)), PlantformConfigModel.class)) {
3710		- return RespBuilder.buildSuccess("已经打印过");
	3710	+ return RespBuilder.buildSuccess("已经打印过了");
3711	3711	}
3712	3712	PlantformConfigModel plantformConfigModel = new PlantformConfigModel();
3713	3713	plantformConfigModel.setType(SequenceConstant.PRIENT_TYPE);

...	...	@@ -10,12 +10,32 @@
10	10	@Form
11	11	public class YunBookbuildingAddRequest {
12	12
	13	+ // 纠正末次月经 (和末次月经反起存)
	14	+ private String fuckLastMens;
13	15	// 末次月经纠正依据
14	16	private String lastMenstrualPeriodBasis;
	17	+ // 末次月经纠正依据
	18	+ private String lastMenstrualPeriodBasisOther;
15	19	// 末次月经纠正医生ID
16	20	private String lastMenstrualPeriodBasisDoctorId;
17	21	// 末次月经纠正时间
18	22	private String lastMenstrualPeriodBasisDate;
	23	+
	24	+ public String getFuckLastMens() {
	25	+ return fuckLastMens;
	26	+ }
	27	+
	28	+ public void setFuckLastMens(String fuckLastMens) {
	29	+ this.fuckLastMens = fuckLastMens;
	30	+ }
	31	+
	32	+ public String getLastMenstrualPeriodBasisOther() {
	33	+ return lastMenstrualPeriodBasisOther;
	34	+ }
	35	+
	36	+ public void setLastMenstrualPeriodBasisOther(String lastMenstrualPeriodBasisOther) {
	37	+ this.lastMenstrualPeriodBasisOther = lastMenstrualPeriodBasisOther;
	38	+ }
19	39
20	40	public String getLastMenstrualPeriodBasis() {
21	41	return lastMenstrualPeriodBasis;

...	...	@@ -7,12 +7,51 @@
7	7	*/
8	8	public class PregnantInfoResult {
9	9
	10	+ // 纠正末次月经
	11	+ private String fuckLastMens;
10	12	// 末次月经纠正依据
11	13	private String lastMenstrualPeriodBasis;
	14	+ private String lastMenstrualPeriodBasisId;
	15	+ // 末次月经纠正依据
	16	+ private String lastMenstrualPeriodBasisOther;
12	17	// 末次月经纠正医生ID
13	18	private String lastMenstrualPeriodBasisDoctorId;
	19	+ private String lastMenstrualPeriodBasisDoctorName;
	20	+
	21	+ public String getLastMenstrualPeriodBasisDoctorName() {
	22	+ return lastMenstrualPeriodBasisDoctorName;
	23	+ }
	24	+
	25	+ public void setLastMenstrualPeriodBasisDoctorName(String lastMenstrualPeriodBasisDoctorName) {
	26	+ this.lastMenstrualPeriodBasisDoctorName = lastMenstrualPeriodBasisDoctorName;
	27	+ }
	28	+
14	29	// 末次月经纠正时间
15	30	private String lastMenstrualPeriodBasisDate;
	31	+
	32	+ public String getLastMenstrualPeriodBasisId() {
	33	+ return lastMenstrualPeriodBasisId;
	34	+ }
	35	+
	36	+ public void setLastMenstrualPeriodBasisId(String lastMenstrualPeriodBasisId) {
	37	+ this.lastMenstrualPeriodBasisId = lastMenstrualPeriodBasisId;
	38	+ }
	39	+
	40	+ public String getLastMenstrualPeriodBasisOther() {
	41	+ return lastMenstrualPeriodBasisOther;
	42	+ }
	43	+
	44	+ public String getFuckLastMens() {
	45	+ return fuckLastMens;
	46	+ }
	47	+
	48	+ public void setLastMenstrualPeriodBasisOther(String lastMenstrualPeriodBasisOther) {
	49	+ this.lastMenstrualPeriodBasisOther = lastMenstrualPeriodBasisOther;
	50	+ }
	51	+
	52	+ public void setFuckLastMens(String fuckLastMens) {
	53	+ this.fuckLastMens = fuckLastMens;
	54	+ }
16	55
17	56	public String getLastMenstrualPeriodBasis() {
18	57	return lastMenstrualPeriodBasis;

...	...	@@ -899,7 +899,11 @@
899	899	map.put("username", p.getUsername());
900	900	map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(p.getPhone()));
901	901	map.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(p.getCardNo()));
902		- map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
	902	+ if(p.getType() == 3 \|\| p.getBuildType() == 2) {
	903	+ map.put("week", "已分娩");
	904	+ } else {
	905	+ map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
	906	+ }
903	907	map.put("doctorName", couponMapper.getUserName(p.getBookbuildingDoctor()));
904	908	String hName = hospitalNameCache.get(p.getHospitalId());
905	909	if(StringUtils.isEmpty(hName)) {
...	...	@@ -1065,7 +1069,8 @@
1065	1069	String householdAddress = findName(pt.getProvinceId()) + findName(pt.getCityId()) + findName(pt.getAreaId()) + findName(pt.getStreetId()) + pt.getAddress();
1066	1070	temp.put("householdAddress", householdAddress.replace("null", "")); /** 户籍地 */
1067	1071	temp.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); /** 当前孕周 */
1068		- temp.put("buildWeek", DateUtil.getWeekDesc(pt.getBookbuildingDate(), new Date())); /** 建档孕周 */
	1072	+ System.out.println(pt.getBookbuildingDate().toLocaleString());
	1073	+ temp.put("buildWeek", DateUtil.getWeekDesc(pt.getLastMenses(), pt.getBookbuildingDate())); /** 建档孕周 */
1069	1074	temp.put("buildDate", DateUtil.getyyyy_MM_dd(pt.getBookbuildingDate())); /** 建档日期 */
1070	1075	temp.put("doctorName", couponMapper.getUserName(pt.getBookbuildingDoctor()));
1071	1076	temp.put("hospitalName", couponMapper.findHospitalNameById(pt.getHospitalId()));