jiangjiazhi / regional-platform

Commit bc87b01de26420f583ac5b4a1c67d6a7d4deca58

Authored by litao@lymsh.com over 7 years ago

Exists in master and in 6 other branches

改需求

Showing 11 changed files with 317 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.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/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.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

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
	5	+/**
	6	+ * 纠正依据
	7	+ */
	8	+public enum BasisEnums {
	9	+ A("1", "早孕B超"),
	10	+ B("2", "排卵日期"),
	11	+ C("3", "同房日期"),
	12	+ D("4", "中孕B超");
	13	+
	14	+ BasisEnums(String id, String name) {
	15	+ this.id = id;
	16	+ this.name = name;
	17	+ }
	18	+
	19	+
	20	+ public static String getName(String id) {
	21	+ if(StringUtils.isEmpty(id)) {
	22	+ return null;
	23	+ }
	24	+ BasisEnums[] values = BasisEnums.values();
	25	+ for (BasisEnums value : values) {
	26	+ if (value.getId().equals(id)) {
	27	+ return value.getName();
	28	+ }
	29	+ }
	30	+ return null;
	31	+ }
	32	+ private String id;
	33	+ private String name;
	34	+
	35	+ public String getId() {
	36	+ return id;
	37	+ }
	38	+
	39	+ public void setId(String id) {
	40	+ this.id = id;
	41	+ }
	42	+
	43	+ public String getName() {
	44	+ return name;
	45	+ }
	46	+
	47	+ public void setName(String name) {
	48	+ this.name = name;
	49	+ }
	50	+
	51	+}

...	...	@@ -18,6 +18,36 @@
18	18
19	19	private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
20	20
	21	+ private String genRemark; // 一般检查备注
	22	+ private String gynRemark; // 妇科检查备注
	23	+
	24	+ public String getGenRemark() {
	25	+ return genRemark;
	26	+ }
	27	+
	28	+ public void setGenRemark(String genRemark) {
	29	+ this.genRemark = genRemark;
	30	+ }
	31	+
	32	+ public String getGynRemark() {
	33	+ return gynRemark;
	34	+ }
	35	+
	36	+ public void setGynRemark(String gynRemark) {
	37	+ this.gynRemark = gynRemark;
	38	+ }
	39	+
	40	+ /** 是否打印过 1=已打印有这个字段就算打印 */
	41	+ private Integer isPrient;
	42	+
	43	+ public Integer getIsPrient() {
	44	+ return isPrient;
	45	+ }
	46	+
	47	+ public void setIsPrient(Integer isPrient) {
	48	+ this.isPrient = isPrient;
	49	+ }
	50	+
21	51	/** 处理意见 */
22	52	private Map<String, List<String>> treatmentOpinion2;
23	53	private List<String> treatmentOpinion2Types;

...	...	@@ -16,6 +16,27 @@
16	16	@Document(collection = "lyms_antex")
17	17	public class AntenatalExaminationModel extends BaseModel {
18	18
	19	+ private String genRemark; // 一般检查备注
	20	+
	21	+ public String getGenRemark() {
	22	+ return genRemark;
	23	+ }
	24	+
	25	+ public void setGenRemark(String genRemark) {
	26	+ this.genRemark = genRemark;
	27	+ }
	28	+
	29	+ /** 是否打印过 1=已打印有这个字段就算打印 */
	30	+ private Integer isPrient;
	31	+
	32	+ public Integer getIsPrient() {
	33	+ return isPrient;
	34	+ }
	35	+
	36	+ public void setIsPrient(Integer isPrient) {
	37	+ this.isPrient = isPrient;
	38	+ }
	39	+
19	40	private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid();
20	41	List<String> mHighRiskReason;
21	42

...	...	@@ -17,6 +17,39 @@
17	17	private static final long serialVersionUID = SerialIdEnum.Patients.getCid();
18	18
19	19
	20	+
	21	+ // 末次月经纠正依据
	22	+ private String lastMenstrualPeriodBasis;
	23	+ // 末次月经纠正医生ID
	24	+ private String lastMenstrualPeriodBasisDoctorId;
	25	+ // 末次月经纠正时间
	26	+ private String lastMenstrualPeriodBasisDate;
	27	+
	28	+ public String getLastMenstrualPeriodBasis() {
	29	+ return lastMenstrualPeriodBasis;
	30	+ }
	31	+
	32	+ public void setLastMenstrualPeriodBasis(String lastMenstrualPeriodBasis) {
	33	+ this.lastMenstrualPeriodBasis = lastMenstrualPeriodBasis;
	34	+ }
	35	+
	36	+ public String getLastMenstrualPeriodBasisDoctorId() {
	37	+ return lastMenstrualPeriodBasisDoctorId;
	38	+ }
	39	+
	40	+ public void setLastMenstrualPeriodBasisDoctorId(String lastMenstrualPeriodBasisDoctorId) {
	41	+ this.lastMenstrualPeriodBasisDoctorId = lastMenstrualPeriodBasisDoctorId;
	42	+ }
	43	+
	44	+ public String getLastMenstrualPeriodBasisDate() {
	45	+ return lastMenstrualPeriodBasisDate;
	46	+ }
	47	+
	48	+ public void setLastMenstrualPeriodBasisDate(String lastMenstrualPeriodBasisDate) {
	49	+ this.lastMenstrualPeriodBasisDate = lastMenstrualPeriodBasisDate;
	50	+ }
	51	+
	52	+
20	53	// 月经周期开始天数
21	54	private String mensStartDay;
22	55

...	...	@@ -33,6 +33,34 @@
33	33	@Autowired
34	34	private AntenatalExaminationFacade antenatalExaminationFacade;
35	35
	36	+
	37	+ /**
	38	+ * 获取初诊复诊是否打印过
	39	+ * type = 1 初诊
	40	+ * type = 2 复诊
	41	+ */
	42	+ @RequestMapping(value = "/get/prient", method = RequestMethod.GET)
	43	+ @ResponseBody
	44	+ @TokenRequired
	45	+ public BaseObjectResponse getIsPrient(@RequestParam String id, @RequestParam Integer type) {
	46	+ return viewFacade.getIsPrient(id, type);
	47	+ }
	48	+
	49	+ /**
	50	+ * 初诊复诊打印后回调controller
	51	+ * type = 1 初诊
	52	+ * type = 2 复诊
	53	+ */
	54	+ @RequestMapping(value = "/prient", method = RequestMethod.GET)
	55	+ @ResponseBody
	56	+ @TokenRequired
	57	+ public BaseObjectResponse prient(@RequestParam String id, @RequestParam Integer type) {
	58	+ return viewFacade.prient(id, type);
	59	+ }
	60	+
	61	+
	62	+
	63	+
36	64	/**
37	65	* 查询初诊接口
38	66	*

...	...	@@ -17,6 +17,7 @@
17	17	import com.lyms.platform.operate.web.result.*;
18	18	import com.lyms.platform.operate.web.utils.JdbcUtil;
19	19	import com.lyms.platform.operate.web.utils.MessageCenterService;
	20	+import com.lyms.platform.permission.dao.master.CouponMapper;
20	21	import com.lyms.platform.permission.model.Organization;
21	22	import com.lyms.platform.permission.model.OrganizationQuery;
22	23	import com.lyms.platform.permission.model.Users;
23	24
...	...	@@ -97,7 +98,10 @@
97	98	@Autowired
98	99	private DzfyHisService dzfyHisService;
99	100
	101	+ @Autowired
	102	+ private CouponMapper couponMapper;
100	103
	104	+
101	105	@Autowired
102	106	private DeleteProcessHandler deleteProcessHandler;
103	107
...	...	@@ -202,6 +206,7 @@
202	206	}
203	207	}
204	208
	209	+
205	210	PersonModel resperson = null;
206	211	if (StringUtils.isNotEmpty(yunRequest.getPregnantCertificateNum())) {
207	212
...	...	@@ -1092,6 +1097,10 @@
1092	1097	public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
1093	1098	Patients patient = new Patients();
1094	1099
	1100	+ patient.setLastMenstrualPeriodBasis(yunRequest.getLastMenstrualPeriodBasis());
	1101	+ patient.setLastMenstrualPeriodBasisDoctorId(yunRequest.getLastMenstrualPeriodBasisDoctorId());
	1102	+ patient.setLastMenstrualPeriodBasisDate(yunRequest.getLastMenstrualPeriodBasisDate());
	1103	+
1095	1104	patient.setMensStartDay(yunRequest.getMensStartDay());
1096	1105
1097	1106	patient.setMensEndDay(yunRequest.getMensEndDay());
...	...	@@ -1234,6 +1243,13 @@
1234	1243
1235	1244	public PregnantInfoResult getResult(Patients p) {
1236	1245	PregnantInfoResult result = new PregnantInfoResult();
	1246	+
	1247	+
	1248	+ result.setLastMenstrualPeriodBasis(p.getLastMenstrualPeriodBasis());
	1249	+ result.setLastMenstrualPeriodBasisDoctorId(couponMapper.getUserName(p.getLastMenstrualPeriodBasisDoctorId()));
	1250	+ result.setLastMenstrualPeriodBasisDate(p.getLastMenstrualPeriodBasisDate());
	1251	+
	1252	+
1237	1253	result.setMensStartDay(p.getMensStartDay());
1238	1254	result.setMensEndDay(p.getMensEndDay());
1239	1255

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	5	import com.lyms.platform.common.enums.*;
6	6	import com.lyms.platform.common.result.BaseObjectResponse;
	7	+import com.lyms.platform.common.result.RespBuilder;
7	8	import com.lyms.platform.common.utils.DateUtil;
8	9	import com.lyms.platform.common.utils.ExceptionUtils;
9	10	import com.lyms.platform.common.utils.JsonUtil;
...	...	@@ -29,6 +30,10 @@
29	30	import org.apache.commons.lang.math.NumberUtils;
30	31	import org.springframework.beans.factory.annotation.Autowired;
31	32	import org.springframework.data.domain.Sort;
	33	+import org.springframework.data.mongodb.core.MongoTemplate;
	34	+import org.springframework.data.mongodb.core.query.Criteria;
	35	+import org.springframework.data.mongodb.core.query.Query;
	36	+import org.springframework.data.mongodb.core.query.Update;
32	37	import org.springframework.stereotype.Component;
33	38
34	39	import java.util.*;
35	40
...	...	@@ -89,7 +94,10 @@
89	94	@Autowired
90	95	private YunBookbuildingService yunBookbuildingService;
91	96
	97	+ @Autowired
	98	+ private MongoTemplate mongoTemplate;
92	99
	100	+
93	101	/**
94	102	* 建档查询
95	103	*
...	...	@@ -1137,6 +1145,9 @@
1137	1145
1138	1146	Map<String, Object> map = new HashMap<>();
1139	1147
	1148	+
	1149	+ map.put("lastMenses", data.getLastMenses());
	1150	+
1140	1151	map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
1141	1152	// map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2()));
1142	1153	map.put("treatmentOpinion3", getTreatmentOpinion3(data.getTreatmentOpinion2()));
...	...	@@ -1564,7 +1575,8 @@
1564	1575	}
1565	1576
1566	1577	if (placenta.getGjkd() != null) {
1567		- placetaMap.put("gjkd", UnitUtils.unitSplice(placenta.getGjkd(), UnitConstants.CM));
	1578	+ placetaMap.put("gjkd", UnitUtils.unitSplice(placenta.getGjkd(), ""));
	1579	+// placetaMap.put("gjkd", UnitUtils.unitSplice(placenta.getGjkd(), UnitConstants.CM));
1568	1580	}
1569	1581
1570	1582	if (placenta.getGjrs() != null) {
...	...	@@ -1811,6 +1823,8 @@
1811	1823
1812	1824	Map<String, Object> map = new HashMap<>();
1813	1825
	1826	+ map.put("lastMenses", data.getLastMenses());
	1827	+
1814	1828	/* 基本信息 */
1815	1829	//孕妇基本信息
1816	1830	map.put("id", data.getId());
...	...	@@ -1959,7 +1973,8 @@
1959	1973	}
1960	1974
1961	1975	if (tire.get("gjkd") != null) {
1962		- tireMap.put("gjkd", UnitUtils.unitSplice(tire.get("gjkd"), UnitConstants.CM));
	1976	+ tireMap.put("gjkd", UnitUtils.unitSplice(tire.get("gjkd"), ""));
	1977	+// tireMap.put("gjkd", UnitUtils.unitSplice(tire.get("gjkd"), UnitConstants.CM));
1963	1978	}
1964	1979
1965	1980	if (tire.get("gjrs") != null) {
...	...	@@ -3670,6 +3685,30 @@
3670	3685	return findPatientData(patients.get(0).getId());
3671	3686	}
3672	3687	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("未查询到数据");
	3688	+ }
	3689	+
	3690	+ public BaseObjectResponse getIsPrient(String id, Integer type) {
	3691	+ if(type == 1) {
	3692	+ AntExChuModel chuModel = mongoTemplate.findById(id, AntExChuModel.class);
	3693	+ if(chuModel != null) {
	3694	+ return RespBuilder.buildSuccess("isPrient", chuModel.getIsPrient() == null ? false : true);
	3695	+ }
	3696	+ } else if (type == 2){
	3697	+ AntenatalExaminationModel examinationModel = mongoTemplate.findById(id, AntenatalExaminationModel.class);
	3698	+ if(examinationModel != null) {
	3699	+ return RespBuilder.buildSuccess("isPrient", examinationModel.getIsPrient() == null ? false : true);
	3700	+ }
	3701	+ }
	3702	+ return RespBuilder.buildSuccess((type == 1 ? "初诊" : "复诊") + "数据未找到");
	3703	+ }
	3704	+
	3705	+ public BaseObjectResponse prient(String id, Integer type) {
	3706	+ if(type == 1) {
	3707	+ mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("isPrient", 1), AntExChuModel.class);
	3708	+ } else if (type == 2){
	3709	+ mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("isPrient", 1), AntenatalExaminationModel.class);
	3710	+ }
	3711	+ return RespBuilder.buildSuccess(flag);
3673	3712	}
3674	3713	}

...	...	@@ -15,6 +15,17 @@
15	15	*/
16	16	@Form
17	17	public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminationModel> {
	18	+
	19	+ private String genRemark; // 一般检查备注
	20	+
	21	+ public String getGenRemark() {
	22	+ return genRemark;
	23	+ }
	24	+
	25	+ public void setGenRemark(String genRemark) {
	26	+ this.genRemark = genRemark;
	27	+ }
	28	+
18	29	List<String> mHighRiskReason;
19	30
20	31	public List<String> getmHighRiskReason() {
...	...	@@ -307,6 +318,7 @@
307	318	@Override
308	319	public AntenatalExaminationModel convertToDataModel() {
309	320	AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
	321	+ examinationModel.setGenRemark(genRemark);
310	322	examinationModel.setmHighRiskReason(mHighRiskReason);
311	323	examinationModel.setQuicken(quicken);
312	324	examinationModel.setQuickenRemark(quickenRemark);

...	...	@@ -20,6 +20,25 @@
20	20	@Form
21	21	public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
22	22
	23	+ private String genRemark; // 一般检查备注
	24	+ private String gynRemark; // 妇科检查备注
	25	+
	26	+ public String getGenRemark() {
	27	+ return genRemark;
	28	+ }
	29	+
	30	+ public void setGenRemark(String genRemark) {
	31	+ this.genRemark = genRemark;
	32	+ }
	33	+
	34	+ public String getGynRemark() {
	35	+ return gynRemark;
	36	+ }
	37	+
	38	+ public void setGynRemark(String gynRemark) {
	39	+ this.gynRemark = gynRemark;
	40	+ }
	41	+
23	42	List<String> mHighRiskReason;
24	43
25	44	private String cweight;
...	...	@@ -1296,6 +1315,8 @@
1296	1315	public AntExChuModel convertToDataModel() {
1297	1316	AntExChuModel antExChuModel = new AntExChuModel();
1298	1317
	1318	+ antExChuModel.setGenRemark(genRemark);
	1319	+ antExChuModel.setGynRemark(gynRemark);
1299	1320	antExChuModel.setTreatmentOpinion2(treatmentOpinion2);
1300	1321	antExChuModel.setTreatmentOpinion2Types(treatmentOpinion2Types);
1301	1322	antExChuModel.setQuicken(quicken);

...	...	@@ -9,7 +9,39 @@
9	9	*/
10	10	@Form
11	11	public class YunBookbuildingAddRequest {
12		- /*********孕妇基本信息*********/
	12	+
	13	+ // 末次月经纠正依据
	14	+ private String lastMenstrualPeriodBasis;
	15	+ // 末次月经纠正医生ID
	16	+ private String lastMenstrualPeriodBasisDoctorId;
	17	+ // 末次月经纠正时间
	18	+ private String lastMenstrualPeriodBasisDate;
	19	+
	20	+ public String getLastMenstrualPeriodBasis() {
	21	+ return lastMenstrualPeriodBasis;
	22	+ }
	23	+
	24	+ public void setLastMenstrualPeriodBasis(String lastMenstrualPeriodBasis) {
	25	+ this.lastMenstrualPeriodBasis = lastMenstrualPeriodBasis;
	26	+ }
	27	+
	28	+ public String getLastMenstrualPeriodBasisDoctorId() {
	29	+ return lastMenstrualPeriodBasisDoctorId;
	30	+ }
	31	+
	32	+ public void setLastMenstrualPeriodBasisDoctorId(String lastMenstrualPeriodBasisDoctorId) {
	33	+ this.lastMenstrualPeriodBasisDoctorId = lastMenstrualPeriodBasisDoctorId;
	34	+ }
	35	+
	36	+ public String getLastMenstrualPeriodBasisDate() {
	37	+ return lastMenstrualPeriodBasisDate;
	38	+ }
	39	+
	40	+ public void setLastMenstrualPeriodBasisDate(String lastMenstrualPeriodBasisDate) {
	41	+ this.lastMenstrualPeriodBasisDate = lastMenstrualPeriodBasisDate;
	42	+ }
	43	+
	44	+ /*********孕妇基本信息*********/
13	45	// 月经周期开始天数
14	46	private String mensStartDay;
15	47

...	...	@@ -7,6 +7,37 @@
7	7	*/
8	8	public class PregnantInfoResult {
9	9
	10	+ // 末次月经纠正依据
	11	+ private String lastMenstrualPeriodBasis;
	12	+ // 末次月经纠正医生ID
	13	+ private String lastMenstrualPeriodBasisDoctorId;
	14	+ // 末次月经纠正时间
	15	+ private String lastMenstrualPeriodBasisDate;
	16	+
	17	+ public String getLastMenstrualPeriodBasis() {
	18	+ return lastMenstrualPeriodBasis;
	19	+ }
	20	+
	21	+ public void setLastMenstrualPeriodBasis(String lastMenstrualPeriodBasis) {
	22	+ this.lastMenstrualPeriodBasis = lastMenstrualPeriodBasis;
	23	+ }
	24	+
	25	+ public String getLastMenstrualPeriodBasisDoctorId() {
	26	+ return lastMenstrualPeriodBasisDoctorId;
	27	+ }
	28	+
	29	+ public void setLastMenstrualPeriodBasisDoctorId(String lastMenstrualPeriodBasisDoctorId) {
	30	+ this.lastMenstrualPeriodBasisDoctorId = lastMenstrualPeriodBasisDoctorId;
	31	+ }
	32	+
	33	+ public String getLastMenstrualPeriodBasisDate() {
	34	+ return lastMenstrualPeriodBasisDate;
	35	+ }
	36	+
	37	+ public void setLastMenstrualPeriodBasisDate(String lastMenstrualPeriodBasisDate) {
	38	+ this.lastMenstrualPeriodBasisDate = lastMenstrualPeriodBasisDate;
	39	+ }
	40	+
10	41	// 月经周期开始天数
11	42	private String mensStartDay;
12	43