jiangjiazhi / regional-platform

Commit d34e6349f6f13db175ff8530a21421ca1d70c975

Authored by zhangchao over 1 year ago

Exists in dev

#fix:优化分娩管理数据同步问题

Showing 7 changed files with 636 additions and 63 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/IdtdyrmFmService.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DtFm.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.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/PatientFacade.java

1	1	package com.lyms.hospitalapi.dtdyrm;
2	2
	3	+import com.lyms.hospitalapi.dzfy.DtFm;
3	4	import com.lyms.hospitalapi.dzfy.Fm;
4	5	import com.lyms.hospitalapi.qhddeyy.QhddeyyFmServiceImpl;
5	6	import com.lyms.hospitalapi.qhdfy.FmItem;
...	...	@@ -58,7 +59,7 @@
58	59	private static final String HOSPITALID = "2100002419";
59	60
60	61	@Override
61		- public void queryFmPatient(List<Fm> list) {
	62	+ public void queryFmPatient(List<DtFm> list) {
62	63	SaveFm sfm = new SaveFm(list);
63	64	Thread t = new Thread(sfm);
64	65	t.start();
65	66
...	...	@@ -68,9 +69,9 @@
68	69
69	70	public class SaveFm implements Runnable{
70	71
71		- private List<Fm> allList;
	72	+ private List<DtFm> allList;
72	73
73		- public SaveFm(List<Fm> list){
	74	+ public SaveFm(List<DtFm> list){
74	75	this.allList=list;
75	76	}
76	77
77	78
78	79
79	80
...	...	@@ -78,20 +79,20 @@
78	79
79	80	SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
80	81	try {
81		- System.out.println("fm=" + allList.toString());
	82	+ System.out.println("fm= startup");
82	83
83	84	List <Users> users = new ArrayList <Users>();
84	85	Date dueDate = null;
85	86	List <MatDeliverAddRequest.Baby> babies = new ArrayList <>();
86	87	MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest();
87	88	Patients patient =null;
88		- for (Fm allFm : allList) {
	89	+ for (DtFm allFm : allList) {
89	90	// System.out.println("0-------------" + allFm.getBABY_PREGNANCY_OUT());
90		- if (!"1".equals(allFm.getBABY_PREGNANCY_OUT())) {
	91	+ if (!"1".equals(allFm.getBaby_PREGNANCY_OUT())) {
91	92	System.out.println("BABY_PREGNANCY_OUT != 1");
92	93	continue;
93	94	}
94		- if (StringUtils.isEmpty(allFm.getPHONE()) && StringUtils.isEmpty(allFm.getIDCARD())) {
	95	+ if (StringUtils.isEmpty(allFm.getPhone()) && StringUtils.isEmpty(allFm.getIdcard())) {
95	96	continue;
96	97	}
97	98	PatientsQuery query = new PatientsQuery();
...	...	@@ -100,7 +101,7 @@
100	101	//20201230 半年后把这个打开
101	102	// query.setType(1); //孕妇
102	103	// query.setDueStatus(0); //未终止妊娠
103		- String[] strs = new String[]{allFm.getPHONE(), allFm.getIDCARD()};
	104	+ String[] strs = new String[]{allFm.getPhone(), allFm.getIdcard()};
104	105	query.setPc(strs);
105	106	//查询该孕妇是否在孕产婴系统中建档
106	107	// System.out.println("1----query--" + query.convertToQuery().convertToMongoQuery());
107	108
...	...	@@ -123,11 +124,11 @@
123	124
124	125	} else{
125	126
126		- if (StringUtils.isNotEmpty(allFm.getIDCARD())){
	127	+ if (StringUtils.isNotEmpty(allFm.getIdcard())&&CollectionUtils.isNotEmpty(users)){
127	128	PersonModel pmodel = new PersonModel();
128		- pmodel.setName(allFm.getNAME());
129		- pmodel.setPhone(allFm.getPHONE());
130		- pmodel.setCardNo(allFm.getIDCARD());
	129	+ pmodel.setName(allFm.getName());
	130	+ pmodel.setPhone(allFm.getPhone());
	131	+ pmodel.setCardNo(allFm.getIdcard());
131	132	pmodel.setType(3);
132	133	pmodel.setModified(new Date());
133	134
134	135
135	136
136	137
137	138
...	...	@@ -139,16 +140,18 @@
139	140	patient.setHospitalId(HOSPITALID);
140	141	patient.setFmHospital(HOSPITALID);
141	142	patient.setFmDate(new Date());
142		- patient.setCardNo(allFm.getIDCARD());
	143	+ patient.setCardNo(allFm.getIdcard());
143	144	patient.setYn(1);
	145	+ patient.setType(3);
144	146	patient.setBookbuildingDate(new Date());
145	147	//patient.setBookbuildingDoctor();
146		- patient.setUsername(allFm.getNAME());
147		- patient.setPhone(allFm.getPHONE());
	148	+ patient.setUsername(allFm.getName());
	149	+ patient.setPhone(allFm.getPhone());
148	150	patient.setPid(resperson.getId());
	151	+ patient.setDueStatus(1);
149	152	patient.setOperator(users.get(0).getId());
150		- patient.setLastMenses(DateUtil.getWeekDay(allFm.getDUE_WEEK().length()>2?-Integer.valueOf(allFm.getDUE_WEEK().substring(0,2)):-Integer.valueOf(allFm.getDUE_WEEK())));
151		- patient.setBirth(DateUtil.parseYMD(DateUtil.getBirthFromIdCard(allFm.getIDCARD())));
	153	+ patient.setLastMenses(DateUtil.getWeekDay(allFm.getDue_WEEK().length()>2?-Integer.valueOf(allFm.getDue_WEEK().substring(0,2)):-Integer.valueOf(allFm.getDue_WEEK())));
	154	+ patient.setBirth(DateUtil.parseYMD(DateUtil.getBirthFromIdCard(allFm.getIdcard())));
152	155	patient.setDeliverDoctor(String.valueOf(users.get(0).getId()));
153	156	patient.setCreated(new Date());
154	157	patient.setModified(new Date());
...	...	@@ -162,8 +165,8 @@
162	165
163	166	if (patient != null && StringUtils.isNotEmpty(patient.getId())) {
164	167	if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) {
165		- if (!StringUtils.isNotEmpty(allFm.getBABY_DELIVERY_TIME())) {
166		- Date dateTime = fmt.parse(allFm.getBABY_DELIVERY_TIME());
	168	+ if (StringUtils.isNotEmpty(allFm.getBaby_DELIVERY_TIME())) {
	169	+ Date dateTime = fmt.parse(allFm.getBaby_DELIVERY_TIME());
167	170	if (dateTime==null) {
168	171	continue;
169	172	} else {
...	...	@@ -179,9 +182,9 @@
179	182	Map <String, String> map3 = new HashMap <>();
180	183	Map <String, String> totalMap = new HashMap <>();
181	184
182		- Integer prod_Process_One = allFm.getPROD_PROCESS_ONE();
183		- Integer prod_Process_Two = allFm.getPROD_PROCESS_TWO();
184		- Integer prod_Process_Three = allFm.getPROD_PROCESS_THREE();
	185	+ Integer prod_Process_One = allFm.getProd_PROCESS_ONE();
	186	+ Integer prod_Process_Two = allFm.getProd_PROCESS_TWO();
	187	+ Integer prod_Process_Three = allFm.getProd_PROCESS_THREE();
185	188	if (prod_Process_One != null) {
186	189	map1.put("h", String.valueOf(prod_Process_One.intValue() / 60));
187	190	map1.put("m", String.valueOf(prod_Process_One.intValue() % 60));
...	...	@@ -198,9 +201,9 @@
198	201	map.put("three", map3);
199	202	}
200	203
201		- if (StringUtils.isNotEmpty(allFm.getTOTAL_PROCESS())){
202		- int hProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())/60;//总产程小时数
203		- int mProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())%60;//总产程分钟数
	204	+ if (StringUtils.isNotEmpty(allFm.getTotal_PROCESS())){
	205	+ int hProcess = Integer.parseInt(allFm.getTotal_PROCESS())/60;//总产程小时数
	206	+ int mProcess = Integer.parseInt(allFm.getTotal_PROCESS())%60;//总产程分钟数
204	207	totalMap.put("h",String.valueOf(hProcess));
205	208	totalMap.put("m",String.valueOf(mProcess));
206	209	}
207	210
208	211
209	212
210	213
211	214
212	215
213	216
214	217
215	218
216	219
217	220
218	221
...	...	@@ -208,54 +211,54 @@
208	211	deliverAddRequest.setTotalprocess(totalMap);
209	212	// System.out.println("6----------" + allFm.getDELIVER_DOCTOR());
210	213
211		- deliverAddRequest.setDeliverDoctor(allFm.getDELIVER_DOCTOR());
	214	+ deliverAddRequest.setDeliverDoctor(allFm.getDeliver_DOCTOR());
212	215	deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate));
213	216	deliverAddRequest.setParentId(patient.getId());
214	217	deliverAddRequest.setPid(patient.getPid());
215	218	deliverAddRequest.setOperationCause("-");
216	219	String week = "";
217		- if (StringUtils.isNotEmpty(allFm.getDUE_WEEK())) {
	220	+ if (StringUtils.isNotEmpty(allFm.getDue_WEEK())) {
218	221
219		- week = allFm.getDUE_WEEK() + "周";
220		- if (StringUtils.isNotEmpty(allFm.getDUE_WEEK()) && StringUtils.isNotEmpty(allFm.getDUE_DAY())) {
221		- week += allFm.getDUE_DAY() + "天";
	222	+ week = allFm.getDue_WEEK() + "周";
	223	+ if (StringUtils.isNotEmpty(allFm.getDue_WEEK()) && StringUtils.isNotEmpty(allFm.getDue_DAY())) {
	224	+ week += allFm.getDue_DAY() + "天";
222	225	}
223	226
224	227	deliverAddRequest.setDueWeek(week);
225	228	}
226	229
227		- deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1)
228		- Integer placenta_Num = allFm.getPLACENTA_NUM();
	230	+ deliverAddRequest.setTireNumber(allFm.getFetus_NUM());// 胎数(之前赋值为死值1)
	231	+ Integer placenta_Num = allFm.getPlacenta_NUM();
229	232	if (placenta_Num != null) {
230		- deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1)
	233	+ deliverAddRequest.setPlacenta(allFm.getPlacenta_NUM().toString());// 胎盘(之前赋值为死值1)
231	234	}
232		- if ("完好".equals(allFm.getPERINEAL_CONDITION()) \|\| "".equals(allFm.getPERINEAL_CONDITION())) {
	235	+ if ("完好".equals(allFm.getPerineal_CONDITION()) \|\| "".equals(allFm.getPerineal_CONDITION())) {
233	236	deliverAddRequest.setPerinealCondition("full");
234		- } else if ("会阴切开".equals(allFm.getPERINEAL_CONDITION()) \|\| "侧切".equals(allFm.getPERINEAL_CONDITION())) {
	237	+ } else if ("会阴切开".equals(allFm.getPerineal_CONDITION()) \|\| "侧切".equals(allFm.getPerineal_CONDITION())) {
235	238	deliverAddRequest.setPerinealCondition("split");
236	239	}
237	240
238		- if ("一度裂伤".equals(allFm.getPERINEAL_CONDITION())) {
	241	+ if ("一度裂伤".equals(allFm.getPerineal_CONDITION())) {
239	242	deliverAddRequest.setSiLielevel(1);
240		- } else if ("二度裂伤".equals(allFm.getPERINEAL_CONDITION())) {
	243	+ } else if ("二度裂伤".equals(allFm.getPerineal_CONDITION())) {
241	244	deliverAddRequest.setSiLielevel(2);
242		- } else if ("三度裂伤".equals(allFm.getPERINEAL_CONDITION())) {
	245	+ } else if ("三度裂伤".equals(allFm.getPerineal_CONDITION())) {
243	246	deliverAddRequest.setSiLielevel(3);
244	247	}
245	248
246		- Integer th_Lose = allFm.getTH_LOSE_BLOOD();
	249	+ Integer th_Lose = allFm.getTh_LOSE_BLOOD();
247	250	if (th_Lose != null) {
248		- if (StringUtils.isNotEmpty(allFm.getTH_LOSE_BLOOD().toString())) {
249		- deliverAddRequest.settHloseBloodL(Double.parseDouble(allFm.getTH_LOSE_BLOOD().toString()));
	251	+ if (StringUtils.isNotEmpty(allFm.getTh_LOSE_BLOOD().toString())) {
	252	+ deliverAddRequest.settHloseBloodL(Double.parseDouble(allFm.getTh_LOSE_BLOOD().toString()));
250	253	}
251	254	}
252	255
253	256	Map deliveryMode = new HashMap(); //分娩方式
254	257
255	258	String fmfs = "";
256		- if (allFm.getDELIVERY_MODE() != null
257		- && ("手术产".equals(allFm.getDELIVERY_MODE())
258		- \|\|"剖宫产".equals(allFm.getDELIVERY_MODE()))
	259	+ if (allFm.getDelivery_MODE() != null
	260	+ && ("手术产".equals(allFm.getDelivery_MODE())
	261	+ \|\|"剖宫产".equals(allFm.getDelivery_MODE()))
259	262	) {
260	263	fmfs = FmTypeEnums.O1.getId();
261	264	} else {
262	265
...	...	@@ -267,9 +270,9 @@
267	270	List <MaternalDeliverModel.ExtPlacenta> extPlacentas = new ArrayList <>();
268	271	MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta();
269	272	String tpmcType = ""; //胎盘娩出方式
270		- if ("手术产".equals(allFm.getTMCTYPE()) \|\| "手取胎盘".equals(allFm.getTMCTYPE())) {
	273	+ if ("手术产".equals(allFm.getTmctype()) \|\| "手取胎盘".equals(allFm.getTmctype())) {
271	274	tpmcType = TpmcTypeEnums.O2.getId();
272		- } else if ("自然产出".equals(allFm.getTMCTYPE()) \|\| "自然娩出".equals(allFm.getTMCTYPE())) {
	275	+ } else if ("自然产出".equals(allFm.getTmctype()) \|\| "自然娩出".equals(allFm.getTmctype())) {
273	276	tpmcType = TpmcTypeEnums.O.getId();
274	277	}
275	278	extPlacenta.setTpmcType(tpmcType);
276	279
...	...	@@ -279,11 +282,11 @@
279	282
280	283	//儿童
281	284	MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
282		- baby.setBabyWeight(allFm.getBABY_WEIGHT() == null ? null : allFm.getBABY_WEIGHT().toString());
	285	+ baby.setBabyWeight(allFm.getBaby_WEIGHT() == null ? null : allFm.getBaby_WEIGHT().toString());
283	286	Map <String, String> as = new HashMap <>();
284		- String pf1 = String.valueOf(allFm.getBABY_APGAR_SCORE_ONE());
285		- String pf5 = String.valueOf(allFm.getBABY_APGAR_SCORE_FIVE());
286		- String pf10 = String.valueOf(allFm.getBABY_APGAR_SCORE_TEN());
	287	+ String pf1 = String.valueOf(allFm.getBaby_APGAR_SCORE_ONE());
	288	+ String pf5 = String.valueOf(allFm.getBaby_APGAR_SCORE_FIVE());
	289	+ String pf10 = String.valueOf(allFm.getBaby_APGAR_SCORE_TEN());
287	290	if (pf1 != null) {
288	291	as.put("pf1", pf1);
289	292	}
...	...	@@ -296,10 +299,10 @@
296	299
297	300
298	301	baby.setApgarScore(as);
299		- baby.setBabyGender("男".equals(allFm.getBABY_SEX()) ? "1" : "0");
300		- String babyHeight = String.valueOf(allFm.getBABY_HEIGHT());
301		- String babyWeight = String.valueOf(allFm.getBABY_WEIGHT());
302		- Integer baby_Asphyxiam = allFm.getBABY_ASPHYXIAM();
	302	+ baby.setBabyGender("男".equals(allFm.getBaby_SEX()) ? "1" : "0");
	303	+ String babyHeight = String.valueOf(allFm.getBaby_HEIGHT());
	304	+ String babyWeight = String.valueOf(allFm.getBaby_WEIGHT());
	305	+ Integer baby_Asphyxiam = allFm.getBaby_ASPHYXIAM();
303	306	if (babyHeight != null) {
304	307	baby.setBabyHeight(babyHeight);//新生儿生长
305	308	}
306	309
...	...	@@ -310,9 +313,9 @@
310	313	baby.setAsphyxiaM(String.valueOf(baby_Asphyxiam)); //窒息分钟
311	314	}
312	315
313		- baby.setDeformity((allFm.getBABY_DEFORMITY() == null ? 0 : 1)); //畸形 0非畸形 1畸形
	316	+ baby.setDeformity((allFm.getBaby_DEFORMITY() == null ? 0 : 1)); //畸形 0非畸形 1畸形
314	317
315		- String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT()=="1"?"活产":"";
	318	+ String baby_Pregnancy_Out = allFm.getBaby_PREGNANCY_OUT()=="1"?"活产":"";
316	319	if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){
317	320	baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局
318	321	}
...	...	@@ -333,6 +336,7 @@
333	336	ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest);
334	337	if (users != null && users.size() > 0) {
335	338	matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId());
	339	+ System.out.println("fm= end");
336	340	}
337	341	}
338	342

1	1	package com.lyms.hospitalapi.dtdyrm;
2	2
	3	+import com.lyms.hospitalapi.dzfy.DtFm;
3	4	import com.lyms.hospitalapi.dzfy.Fm;
4	5
5	6	import java.util.List;
6	7
7	8	public interface IdtdyrmFmService {
8		- public void queryFmPatient(List<Fm> list);
	9	+ public void queryFmPatient(List<DtFm> list);
9	10	}

	1	+package com.lyms.hospitalapi.dzfy;
	2	+
	3	+/**
	4	+ * 大同分娩管理
	5	+ */
	6	+public class DtFm {
	7	+ private String id;
	8	+ private String bhnum;
	9	+ private String vccardno;
	10	+ private String name;
	11	+ private String phone;
	12	+ private String idcard;
	13	+ private String addr;
	14	+ private Integer fetus_NUM;
	15	+ private Integer placenta_NUM;
	16	+ private String delivery_MODE;
	17	+ private String operation_CAUSE;
	18	+ private Integer prod_PROCESS_ONE;
	19	+ private Integer prod_PROCESS_TWO;
	20	+ private Integer prod_PROCESS_THREE;
	21	+ private String total_PROCESS;
	22	+ private Integer silie_LEVEL;
	23	+ private Integer needle_NUM;
	24	+ private String maternal_INFO;
	25	+ private String death_CAUSE;
	26	+ private String chbp;
	27	+ private String ch2BP;
	28	+ private Integer breath;
	29	+ private Integer pulse;
	30	+ private Integer oh_LOSE_BLOOD;
	31	+ private Integer th_LOSE_BLOOD;
	32	+ private String baby_SEX;
	33	+ private String tmctype;
	34	+ private String perineal_CONDITION;
	35	+ private String um_EXTYPE;
	36	+ private Integer rh_LOSE_BLOOD;
	37	+ private Integer sh_LOSE_BLOOD;
	38	+ private String lose_BLOOD_CAUSE;
	39	+ private String ocs;
	40	+ private String deliver_HOSPITAL;
	41	+ private String deliver_DOCTOR;
	42	+ private String baby_FETAL_PRESENTATION;
	43	+ private String baby_FETAL_POSITION;
	44	+ private String baby_DELIVERY_TIME;
	45	+ private Integer baby_WEIGHT;
	46	+ private Integer baby_HEIGHT;
	47	+ private Integer baby_DEFORMITY;
	48	+ private Integer baby_APGAR_SCORE_ONE;
	49	+ private Integer baby_APGAR_SCORE_FIVE;
	50	+ private Integer baby_APGAR_SCORE_TEN;
	51	+ private Integer baby_ASPHYXIAM;
	52	+ private String baby_SICK;
	53	+ private Integer baby_TOUCH_STARTM;
	54	+ private Integer baby_TOUCH_LASTM;
	55	+ private String baby_EARLYSUCK;
	56	+ private String tmcside;
	57	+ private String tlong;
	58	+ private String twidth;
	59	+ private String theight;
	60	+ private String tweight;
	61	+ private String um_LENGTH;
	62	+ private String modified;
	63	+ private String baby_PREGNANCY_OUT;
	64	+ private String created;
	65	+ private String due_WEEK;
	66	+ private String due_DAY;
	67	+ private String vision;
	68	+
	69	+ public String getId() {
	70	+ return id;
	71	+ }
	72	+
	73	+ public void setId(String id) {
	74	+ this.id = id;
	75	+ }
	76	+
	77	+ public String getBhnum() {
	78	+ return bhnum;
	79	+ }
	80	+
	81	+ public void setBhnum(String bhnum) {
	82	+ this.bhnum = bhnum;
	83	+ }
	84	+
	85	+ public String getVccardno() {
	86	+ return vccardno;
	87	+ }
	88	+
	89	+ public void setVccardno(String vccardno) {
	90	+ this.vccardno = vccardno;
	91	+ }
	92	+
	93	+ public String getName() {
	94	+ return name;
	95	+ }
	96	+
	97	+ public void setName(String name) {
	98	+ this.name = name;
	99	+ }
	100	+
	101	+ public String getPhone() {
	102	+ return phone;
	103	+ }
	104	+
	105	+ public void setPhone(String phone) {
	106	+ this.phone = phone;
	107	+ }
	108	+
	109	+ public String getIdcard() {
	110	+ return idcard;
	111	+ }
	112	+
	113	+ public void setIdcard(String idcard) {
	114	+ this.idcard = idcard;
	115	+ }
	116	+
	117	+ public String getAddr() {
	118	+ return addr;
	119	+ }
	120	+
	121	+ public void setAddr(String addr) {
	122	+ this.addr = addr;
	123	+ }
	124	+
	125	+ public Integer getFetus_NUM() {
	126	+ return fetus_NUM;
	127	+ }
	128	+
	129	+ public void setFetus_NUM(Integer fetus_NUM) {
	130	+ this.fetus_NUM = fetus_NUM;
	131	+ }
	132	+
	133	+ public Integer getPlacenta_NUM() {
	134	+ return placenta_NUM;
	135	+ }
	136	+
	137	+ public void setPlacenta_NUM(Integer placenta_NUM) {
	138	+ this.placenta_NUM = placenta_NUM;
	139	+ }
	140	+
	141	+ public String getDelivery_MODE() {
	142	+ return delivery_MODE;
	143	+ }
	144	+
	145	+ public void setDelivery_MODE(String delivery_MODE) {
	146	+ this.delivery_MODE = delivery_MODE;
	147	+ }
	148	+
	149	+ public String getOperation_CAUSE() {
	150	+ return operation_CAUSE;
	151	+ }
	152	+
	153	+ public void setOperation_CAUSE(String operation_CAUSE) {
	154	+ this.operation_CAUSE = operation_CAUSE;
	155	+ }
	156	+
	157	+ public Integer getProd_PROCESS_ONE() {
	158	+ return prod_PROCESS_ONE;
	159	+ }
	160	+
	161	+ public void setProd_PROCESS_ONE(Integer prod_PROCESS_ONE) {
	162	+ this.prod_PROCESS_ONE = prod_PROCESS_ONE;
	163	+ }
	164	+
	165	+ public Integer getProd_PROCESS_TWO() {
	166	+ return prod_PROCESS_TWO;
	167	+ }
	168	+
	169	+ public void setProd_PROCESS_TWO(Integer prod_PROCESS_TWO) {
	170	+ this.prod_PROCESS_TWO = prod_PROCESS_TWO;
	171	+ }
	172	+
	173	+ public Integer getProd_PROCESS_THREE() {
	174	+ return prod_PROCESS_THREE;
	175	+ }
	176	+
	177	+ public void setProd_PROCESS_THREE(Integer prod_PROCESS_THREE) {
	178	+ this.prod_PROCESS_THREE = prod_PROCESS_THREE;
	179	+ }
	180	+
	181	+ public String getTotal_PROCESS() {
	182	+ return total_PROCESS;
	183	+ }
	184	+
	185	+ public void setTotal_PROCESS(String total_PROCESS) {
	186	+ this.total_PROCESS = total_PROCESS;
	187	+ }
	188	+
	189	+ public Integer getSilie_LEVEL() {
	190	+ return silie_LEVEL;
	191	+ }
	192	+
	193	+ public void setSilie_LEVEL(Integer silie_LEVEL) {
	194	+ this.silie_LEVEL = silie_LEVEL;
	195	+ }
	196	+
	197	+ public Integer getNeedle_NUM() {
	198	+ return needle_NUM;
	199	+ }
	200	+
	201	+ public void setNeedle_NUM(Integer needle_NUM) {
	202	+ this.needle_NUM = needle_NUM;
	203	+ }
	204	+
	205	+ public String getMaternal_INFO() {
	206	+ return maternal_INFO;
	207	+ }
	208	+
	209	+ public void setMaternal_INFO(String maternal_INFO) {
	210	+ this.maternal_INFO = maternal_INFO;
	211	+ }
	212	+
	213	+ public String getDeath_CAUSE() {
	214	+ return death_CAUSE;
	215	+ }
	216	+
	217	+ public void setDeath_CAUSE(String death_CAUSE) {
	218	+ this.death_CAUSE = death_CAUSE;
	219	+ }
	220	+
	221	+ public String getChbp() {
	222	+ return chbp;
	223	+ }
	224	+
	225	+ public void setChbp(String chbp) {
	226	+ this.chbp = chbp;
	227	+ }
	228	+
	229	+ public String getCh2BP() {
	230	+ return ch2BP;
	231	+ }
	232	+
	233	+ public void setCh2BP(String ch2BP) {
	234	+ this.ch2BP = ch2BP;
	235	+ }
	236	+
	237	+ public Integer getBreath() {
	238	+ return breath;
	239	+ }
	240	+
	241	+ public void setBreath(Integer breath) {
	242	+ this.breath = breath;
	243	+ }
	244	+
	245	+ public Integer getPulse() {
	246	+ return pulse;
	247	+ }
	248	+
	249	+ public void setPulse(Integer pulse) {
	250	+ this.pulse = pulse;
	251	+ }
	252	+
	253	+ public Integer getOh_LOSE_BLOOD() {
	254	+ return oh_LOSE_BLOOD;
	255	+ }
	256	+
	257	+ public void setOh_LOSE_BLOOD(Integer oh_LOSE_BLOOD) {
	258	+ this.oh_LOSE_BLOOD = oh_LOSE_BLOOD;
	259	+ }
	260	+
	261	+ public Integer getTh_LOSE_BLOOD() {
	262	+ return th_LOSE_BLOOD;
	263	+ }
	264	+
	265	+ public void setTh_LOSE_BLOOD(Integer th_LOSE_BLOOD) {
	266	+ this.th_LOSE_BLOOD = th_LOSE_BLOOD;
	267	+ }
	268	+
	269	+ public String getBaby_SEX() {
	270	+ return baby_SEX;
	271	+ }
	272	+
	273	+ public void setBaby_SEX(String baby_SEX) {
	274	+ this.baby_SEX = baby_SEX;
	275	+ }
	276	+
	277	+ public String getTmctype() {
	278	+ return tmctype;
	279	+ }
	280	+
	281	+ public void setTmctype(String tmctype) {
	282	+ this.tmctype = tmctype;
	283	+ }
	284	+
	285	+ public String getPerineal_CONDITION() {
	286	+ return perineal_CONDITION;
	287	+ }
	288	+
	289	+ public void setPerineal_CONDITION(String perineal_CONDITION) {
	290	+ this.perineal_CONDITION = perineal_CONDITION;
	291	+ }
	292	+
	293	+ public String getUm_EXTYPE() {
	294	+ return um_EXTYPE;
	295	+ }
	296	+
	297	+ public void setUm_EXTYPE(String um_EXTYPE) {
	298	+ this.um_EXTYPE = um_EXTYPE;
	299	+ }
	300	+
	301	+ public Integer getRh_LOSE_BLOOD() {
	302	+ return rh_LOSE_BLOOD;
	303	+ }
	304	+
	305	+ public void setRh_LOSE_BLOOD(Integer rh_LOSE_BLOOD) {
	306	+ this.rh_LOSE_BLOOD = rh_LOSE_BLOOD;
	307	+ }
	308	+
	309	+ public Integer getSh_LOSE_BLOOD() {
	310	+ return sh_LOSE_BLOOD;
	311	+ }
	312	+
	313	+ public void setSh_LOSE_BLOOD(Integer sh_LOSE_BLOOD) {
	314	+ this.sh_LOSE_BLOOD = sh_LOSE_BLOOD;
	315	+ }
	316	+
	317	+ public String getLose_BLOOD_CAUSE() {
	318	+ return lose_BLOOD_CAUSE;
	319	+ }
	320	+
	321	+ public void setLose_BLOOD_CAUSE(String lose_BLOOD_CAUSE) {
	322	+ this.lose_BLOOD_CAUSE = lose_BLOOD_CAUSE;
	323	+ }
	324	+
	325	+ public String getOcs() {
	326	+ return ocs;
	327	+ }
	328	+
	329	+ public void setOcs(String ocs) {
	330	+ this.ocs = ocs;
	331	+ }
	332	+
	333	+ public String getDeliver_HOSPITAL() {
	334	+ return deliver_HOSPITAL;
	335	+ }
	336	+
	337	+ public void setDeliver_HOSPITAL(String deliver_HOSPITAL) {
	338	+ this.deliver_HOSPITAL = deliver_HOSPITAL;
	339	+ }
	340	+
	341	+ public String getDeliver_DOCTOR() {
	342	+ return deliver_DOCTOR;
	343	+ }
	344	+
	345	+ public void setDeliver_DOCTOR(String deliver_DOCTOR) {
	346	+ this.deliver_DOCTOR = deliver_DOCTOR;
	347	+ }
	348	+
	349	+ public String getBaby_FETAL_PRESENTATION() {
	350	+ return baby_FETAL_PRESENTATION;
	351	+ }
	352	+
	353	+ public void setBaby_FETAL_PRESENTATION(String baby_FETAL_PRESENTATION) {
	354	+ this.baby_FETAL_PRESENTATION = baby_FETAL_PRESENTATION;
	355	+ }
	356	+
	357	+ public String getBaby_FETAL_POSITION() {
	358	+ return baby_FETAL_POSITION;
	359	+ }
	360	+
	361	+ public void setBaby_FETAL_POSITION(String baby_FETAL_POSITION) {
	362	+ this.baby_FETAL_POSITION = baby_FETAL_POSITION;
	363	+ }
	364	+
	365	+ public String getBaby_DELIVERY_TIME() {
	366	+ return baby_DELIVERY_TIME;
	367	+ }
	368	+
	369	+ public void setBaby_DELIVERY_TIME(String baby_DELIVERY_TIME) {
	370	+ this.baby_DELIVERY_TIME = baby_DELIVERY_TIME;
	371	+ }
	372	+
	373	+ public Integer getBaby_WEIGHT() {
	374	+ return baby_WEIGHT;
	375	+ }
	376	+
	377	+ public void setBaby_WEIGHT(Integer baby_WEIGHT) {
	378	+ this.baby_WEIGHT = baby_WEIGHT;
	379	+ }
	380	+
	381	+ public Integer getBaby_HEIGHT() {
	382	+ return baby_HEIGHT;
	383	+ }
	384	+
	385	+ public void setBaby_HEIGHT(Integer baby_HEIGHT) {
	386	+ this.baby_HEIGHT = baby_HEIGHT;
	387	+ }
	388	+
	389	+ public Integer getBaby_DEFORMITY() {
	390	+ return baby_DEFORMITY;
	391	+ }
	392	+
	393	+ public void setBaby_DEFORMITY(Integer baby_DEFORMITY) {
	394	+ this.baby_DEFORMITY = baby_DEFORMITY;
	395	+ }
	396	+
	397	+ public Integer getBaby_APGAR_SCORE_ONE() {
	398	+ return baby_APGAR_SCORE_ONE;
	399	+ }
	400	+
	401	+ public void setBaby_APGAR_SCORE_ONE(Integer baby_APGAR_SCORE_ONE) {
	402	+ this.baby_APGAR_SCORE_ONE = baby_APGAR_SCORE_ONE;
	403	+ }
	404	+
	405	+ public Integer getBaby_APGAR_SCORE_FIVE() {
	406	+ return baby_APGAR_SCORE_FIVE;
	407	+ }
	408	+
	409	+ public void setBaby_APGAR_SCORE_FIVE(Integer baby_APGAR_SCORE_FIVE) {
	410	+ this.baby_APGAR_SCORE_FIVE = baby_APGAR_SCORE_FIVE;
	411	+ }
	412	+
	413	+ public Integer getBaby_APGAR_SCORE_TEN() {
	414	+ return baby_APGAR_SCORE_TEN;
	415	+ }
	416	+
	417	+ public void setBaby_APGAR_SCORE_TEN(Integer baby_APGAR_SCORE_TEN) {
	418	+ this.baby_APGAR_SCORE_TEN = baby_APGAR_SCORE_TEN;
	419	+ }
	420	+
	421	+ public Integer getBaby_ASPHYXIAM() {
	422	+ return baby_ASPHYXIAM;
	423	+ }
	424	+
	425	+ public void setBaby_ASPHYXIAM(Integer baby_ASPHYXIAM) {
	426	+ this.baby_ASPHYXIAM = baby_ASPHYXIAM;
	427	+ }
	428	+
	429	+ public String getBaby_SICK() {
	430	+ return baby_SICK;
	431	+ }
	432	+
	433	+ public void setBaby_SICK(String baby_SICK) {
	434	+ this.baby_SICK = baby_SICK;
	435	+ }
	436	+
	437	+ public Integer getBaby_TOUCH_STARTM() {
	438	+ return baby_TOUCH_STARTM;
	439	+ }
	440	+
	441	+ public void setBaby_TOUCH_STARTM(Integer baby_TOUCH_STARTM) {
	442	+ this.baby_TOUCH_STARTM = baby_TOUCH_STARTM;
	443	+ }
	444	+
	445	+ public Integer getBaby_TOUCH_LASTM() {
	446	+ return baby_TOUCH_LASTM;
	447	+ }
	448	+
	449	+ public void setBaby_TOUCH_LASTM(Integer baby_TOUCH_LASTM) {
	450	+ this.baby_TOUCH_LASTM = baby_TOUCH_LASTM;
	451	+ }
	452	+
	453	+ public String getBaby_EARLYSUCK() {
	454	+ return baby_EARLYSUCK;
	455	+ }
	456	+
	457	+ public void setBaby_EARLYSUCK(String baby_EARLYSUCK) {
	458	+ this.baby_EARLYSUCK = baby_EARLYSUCK;
	459	+ }
	460	+
	461	+ public String getTmcside() {
	462	+ return tmcside;
	463	+ }
	464	+
	465	+ public void setTmcside(String tmcside) {
	466	+ this.tmcside = tmcside;
	467	+ }
	468	+
	469	+ public String getTlong() {
	470	+ return tlong;
	471	+ }
	472	+
	473	+ public void setTlong(String tlong) {
	474	+ this.tlong = tlong;
	475	+ }
	476	+
	477	+ public String getTwidth() {
	478	+ return twidth;
	479	+ }
	480	+
	481	+ public void setTwidth(String twidth) {
	482	+ this.twidth = twidth;
	483	+ }
	484	+
	485	+ public String getTheight() {
	486	+ return theight;
	487	+ }
	488	+
	489	+ public void setTheight(String theight) {
	490	+ this.theight = theight;
	491	+ }
	492	+
	493	+ public String getTweight() {
	494	+ return tweight;
	495	+ }
	496	+
	497	+ public void setTweight(String tweight) {
	498	+ this.tweight = tweight;
	499	+ }
	500	+
	501	+ public String getUm_LENGTH() {
	502	+ return um_LENGTH;
	503	+ }
	504	+
	505	+ public void setUm_LENGTH(String um_LENGTH) {
	506	+ this.um_LENGTH = um_LENGTH;
	507	+ }
	508	+
	509	+ public String getModified() {
	510	+ return modified;
	511	+ }
	512	+
	513	+ public void setModified(String modified) {
	514	+ this.modified = modified;
	515	+ }
	516	+
	517	+ public String getBaby_PREGNANCY_OUT() {
	518	+ return baby_PREGNANCY_OUT;
	519	+ }
	520	+
	521	+ public void setBaby_PREGNANCY_OUT(String baby_PREGNANCY_OUT) {
	522	+ this.baby_PREGNANCY_OUT = baby_PREGNANCY_OUT;
	523	+ }
	524	+
	525	+ public String getCreated() {
	526	+ return created;
	527	+ }
	528	+
	529	+ public void setCreated(String created) {
	530	+ this.created = created;
	531	+ }
	532	+
	533	+ public String getDue_WEEK() {
	534	+ return due_WEEK;
	535	+ }
	536	+
	537	+ public void setDue_WEEK(String due_WEEK) {
	538	+ this.due_WEEK = due_WEEK;
	539	+ }
	540	+
	541	+ public String getDue_DAY() {
	542	+ return due_DAY;
	543	+ }
	544	+
	545	+ public void setDue_DAY(String due_DAY) {
	546	+ this.due_DAY = due_DAY;
	547	+ }
	548	+
	549	+ public String getVision() {
	550	+ return vision;
	551	+ }
	552	+
	553	+ public void setVision(String vision) {
	554	+ this.vision = vision;
	555	+ }
	556	+}

1	1	package com.lyms.platform.operate.web.controller;
2	2
3	3	import com.lyms.hospitalapi.dtdyrm.IdtdyrmFmService;
	4	+import com.lyms.hospitalapi.dzfy.DtFm;
4	5	import com.lyms.hospitalapi.dzfy.Fm;
5	6	import com.lyms.hospitalapi.linchengfy.LcfyFmService;
6	7	import com.lyms.hospitalapi.lpfy.IlpFyFmService;
...	...	@@ -8,6 +9,7 @@
8	9	import com.lyms.hospitalapi.qhddeyy.IQhddeyyFmServcie;
9	10	import com.lyms.platform.common.utils.ExceptionUtils;
10	11	import com.lyms.platform.common.utils.JsonUtil;
	12	+import org.apache.commons.collections.CollectionUtils;
11	13	import org.springframework.beans.factory.annotation.Autowired;
12	14	import org.springframework.stereotype.Controller;
13	15	import org.springframework.web.bind.annotation.RequestBody;
14	16
...	...	@@ -53,10 +55,19 @@
53	55	llcFyFmService.queryFmPatient(models);
54	56	}if("45".equals(models.get(0).getVision())){
55	57	qhddeyyFmServcie.queryFmPatient(models);
56		- }if ("50".equals(models.get(0).getVision())){
57		- idtdyrmFmService.queryFmPatient(models);
58	58	}
59	59
	60	+ return JsonUtil.array2JsonString(models);
	61	+ }
	62	+
	63	+ @RequestMapping(method = RequestMethod.POST, value = "/dtSaveFmData")
	64	+ @ResponseBody
	65	+ public String dtSaveFmData(@Valid @RequestBody List<DtFm> models, HttpServletRequest httpServletRequest){
	66	+ if (CollectionUtils.isNotEmpty(models)){
	67	+ if ("50".equals(models.get(0).getVision())){
	68	+ idtdyrmFmService.queryFmPatient(models);
	69	+ }
	70	+ }
60	71	return JsonUtil.array2JsonString(models);
61	72	}
62	73

...	...	@@ -220,7 +220,7 @@
220	220	if("2100002419".equals(hospitalId)){//大同
221	221	Users u = usersService.getUsers(userId);
222	222	//产科网络及医务科看全科室的
223		- if(2100004954 == u.getDeptId() \|\| 2100004955 == u.getDeptId()){
	223	+ if(2100004948 == u.getDeptId() \|\| 2100004960 == u.getDeptId()){
224	224	if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){
225	225	antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor());
226	226	}

...	...	@@ -2707,7 +2707,7 @@
2707	2707	if("2100002419".equals(hid)){//大同
2708	2708	Users u = usersService.getUsers(childbirthManagerRequest.getOperatorId());
2709	2709	//产科网络及医务科看全科室的
2710		- if(2100004954 == u.getDeptId() \|\| 2100004955 == u.getDeptId()){
	2710	+ if(2100004948 == u.getDeptId() \|\| 2100004960 == u.getDeptId()){
2711	2711	if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {
2712	2712	patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor());
2713	2713	}
...	...	@@ -2875,7 +2875,7 @@
2875	2875	if (null != childbirthManagerRequest.getCesareanTimeType()) {
2876	2876	matDeliverQuery.setCesareanTimeType(childbirthManagerRequest.getCesareanTimeType());
2877	2877	}
2878		-
	2878	+ System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2879	2879	maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2880	2880	// 这里就设置分页内容
2881	2881	childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());

...	...	@@ -1748,6 +1748,7 @@
1748	1748	PatientsQuery patientsQuery = new PatientsQuery();//complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
1749	1749	patientsQuery.setHospitalId(hospital);
1750	1750	patientsQuery.setNeed(needPage);
	1751	+ patientsQuery.setType(type);
1751	1752	patientsQuery.setLimit(riskPatientsQueryRequest.getLimit());
1752	1753	patientsQuery.setPage(riskPatientsQueryRequest.getPage());
1753	1754	//查询符合条件的孕妇
...	...	@@ -3191,7 +3192,7 @@
3191	3192	if("2100002419".equals(hospitalId)){
3192	3193	Users u = usersService.getUsers(patientManagerRequest.getOperatorId());
3193	3194	//产科网络及医务科看全科室的
3194		- if(2100004954 == u.getDeptId() \|\| 2100004955 == u.getDeptId()){
	3195	+ if(2100004948 == u.getDeptId() \|\| 2100004960 == u.getDeptId()){
3195	3196	patientsQuery.setBookbuildingDoctor(StringUtils.isEmpty(patientManagerRequest.getBookbuildingDoctor()) ? null : patientManagerRequest.getBookbuildingDoctor());
3196	3197	}else if(4 == u.getZhiChenId()){//主任看本科室
3197	3198	List<String> bookbuildingDoctorList = new ArrayList<>();