jiangjiazhi / regional-platform

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

Showing 8 changed files with 65 additions and 3 deletions

...	...	@@ -17,6 +17,8 @@
17	17	public class Patients extends BaseModel {
18	18
19	19	private static final long serialVersionUID = SerialIdEnum.Patients.getCid();
	20	+ /20201130 null历史\|\|1 不是特殊产筛建档, 2 衡水特殊产筛建档 /
	21	+ private String screening;
20	22
21	23	//预约住院分娩医院(滦平定制)
22	24	private String yyzyfmHospitalId;
...	...	@@ -1545,6 +1547,14 @@
1545	1547
1546	1548	public void setHstreetRegisterId(String hstreetRegisterId) {
1547	1549	this.hstreetRegisterId = hstreetRegisterId;
	1550	+ }
	1551	+
	1552	+ public String getScreening() {
	1553	+ return screening;
	1554	+ }
	1555	+
	1556	+ public void setScreening(String screening) {
	1557	+ this.screening = screening;
1548	1558	}
1549	1559
1550	1560	public String getStreetId() {

...	...	@@ -20,6 +20,10 @@
20	20	* @author Administrator
21	21	*/
22	22	public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
	23	+
	24	+ /20201130 null历史\|\|1 不是特殊产筛建档, 2 衡水特殊产筛建档 /
	25	+ private String screening;
	26	+
23	27	//预约住院分娩医院(滦平定制)
24	28	private String yyzyfmHospitalId;
25	29
26	30
...	...	@@ -597,8 +601,10 @@
597	601	if (pcerteTypeId != null) {
598	602	condition = condition.and("pcerteTypeId", pcerteTypeId, MongoOper.IS);
599	603	}
	604	+ if (StringUtils.isNotEmpty(screening)) {
	605	+ condition = condition.and("screening", screening, MongoOper.IS);
	606	+ }
600	607
601		-
602	608	if (isFace) {
603	609	condition = condition.and("face", true, MongoOper.EXISTS);
604	610	}
...	...	@@ -1431,6 +1437,14 @@
1431	1437
1432	1438	public void setExtSource(Boolean extSource) {
1433	1439	this.extSource = extSource;
	1440	+ }
	1441	+
	1442	+ public String getScreening() {
	1443	+ return screening;
	1444	+ }
	1445	+
	1446	+ public void setScreening(String screening) {
	1447	+ this.screening = screening;
1434	1448	}
1435	1449
1436	1450	public boolean isFace() {

...	...	@@ -350,6 +350,7 @@
350	350	patient.setCreated(new Date());
351	351	patient.setModified(new Date());
352	352	patient.setOperator(userId);
	353	+ patient.setScreening(yunRequest.getScreening());//特殊产筛建档
353	354
354	355	//生成条形码
355	356	getNumberCode(patient);
...	...	@@ -1213,6 +1214,7 @@
1213	1214	}*/
1214	1215
1215	1216	patient.setOperator(userId);
	1217	+ patient.setScreening(yunRequest.getScreening());//特殊产筛建档
1216	1218
1217	1219	Patients beforePatient = yunBookbuildingService.findOneById(id);
1218	1220

...	...	@@ -1814,6 +1814,7 @@
1814	1814	PatientManagerResult patientManagerResult = new PatientManagerResult();
1815	1815
1816	1816	PatientsQuery patientsQuery = new PatientsQuery();
	1817	+ patientsQuery.setScreening(patientManagerRequest.getScreening());
1817	1818
1818	1819	patientsQuery.setYyzyfmHospitalId(patientManagerRequest.getYyzyfmHospitalId());
1819	1820

...	...	@@ -1175,6 +1175,9 @@
1175	1175	HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false);
1176	1176	PatientBaseResult patientBaseResult = new PatientBaseResult();
1177	1177	if (null != pat) {
	1178	+ /20201130 衡水增加户籍地址 /
	1179	+ patientBaseResult.setMaddress(CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(),
	1180	+ pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址
1178	1181
1179	1182	/*
1180	1183	20200608 产筛修改 wtt ,去掉已申请过产筛限制，可以多次申请产筛
...	...	@@ -1273,8 +1276,7 @@
1273	1276	PatientBaseResult patientBaseResult = new PatientBaseResult();
1274	1277	if (null != pat) {
1275	1278
1276		- /*
1277		- 20200608 产筛修改 wtt ,去掉已申请过产筛限制，可以多次申请产筛*/
	1279	+ /* 20200608 产筛修改 wtt ,去掉已申请过产筛限制，可以多次申请产筛*/
1278	1280	SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
1279	1281	sieveApplyOrderQuery1.setParentId(pat.getId());
1280	1282	sieveApplyOrderQuery1.setHospitalId(hospitalId);

...	...	@@ -7,6 +7,9 @@
7	7	*/
8	8	public class PatientManagerRequest extends BasePageQueryRequest {
9	9
	10	+ /20201130 null历史\|\|1 不是特殊产筛建档, 2 衡水特殊产筛建档 /
	11	+ private String screening;
	12	+
10	13	//预约住院分娩医院(滦平定制)
11	14	private String yyzyfmHospitalId;
12	15
...	...	@@ -142,6 +145,14 @@
142	145
143	146	public void setLiveType(String liveType) {
144	147	this.liveType = liveType;
	148	+ }
	149	+
	150	+ public String getScreening() {
	151	+ return screening;
	152	+ }
	153	+
	154	+ public void setScreening(String screening) {
	155	+ this.screening = screening;
145	156	}
146	157
147	158	public String getAssistUserId() {

...	...	@@ -13,6 +13,10 @@
13	13	*/
14	14	@Form
15	15	public class YunBookbuildingAddRequest {
	16	+
	17	+ /20201130 null历史\|\|1 不是特殊产筛建档, 2 衡水特殊产筛建档 /
	18	+ private String screening;
	19	+
16	20	//预约住院分娩医院(滦平定制)
17	21	private String yyzyfmHospitalId;
18	22
...	...	@@ -62,6 +66,14 @@
62	66
63	67	public FilePathModel getFilePath() {
64	68	return filePath;
	69	+ }
	70	+
	71	+ public String getScreening() {
	72	+ return screening;
	73	+ }
	74	+
	75	+ public void setScreening(String screening) {
	76	+ this.screening = screening;
65	77	}
66	78
67	79	public void setFilePath(FilePathModel filePath) {

...	...	@@ -67,6 +67,16 @@
67	67	private boolean hasPrintInWeek;
68	68
69	69	private String bmi;
	70	+ //户籍地址
	71	+ private String maddress;
	72	+
	73	+ public String getMaddress() {
	74	+ return maddress;
	75	+ }
	76	+
	77	+ public void setMaddress(String maddress) {
	78	+ this.maddress = maddress;
	79	+ }
70	80
71	81	public String getBmi() {
72	82	return bmi;