jiangjiazhi / regional-platform

Commit c894f3b869ed23028566b3883aee520bee1d976c

Authored by dongqin over 6 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 12 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.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/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java

...	...	@@ -195,20 +195,28 @@
195	195	AntExChuModel antExChuModel = antExChuModels.get(antExChuModels.size() - 1);
196	196	AntExChuModel antExChuModel1 = new AntExChuModel();
197	197	//3 更新初诊记录
198		- antExChuModelUpadte(model, antExChuModel, antExChuModel1);
	198	+ if("2100001291".equals(antExChuModel.getHospitalId())){
	199	+ antExChuModelUpadte(model, antExChuModel, antExChuModel1);
	200	+ }else if("216".equals(antExChuModel.getHospitalId())){
	201	+ antExChuModelQHDUpadte(model, antExChuModel, antExChuModel1);
	202	+ }
199	203	antExService.updateAntExChu(antExChuModel1,antExChuModel.getId());
200	204	}
201	205	}else {
202	206	AntenatalExaminationModel antenatalExaminationModel= AntenatalExaminationModels.get(AntenatalExaminationModels.size() - 1);
203	207	AntenatalExaminationModel antenatalExaminationModel1 = new AntenatalExaminationModel();
204	208	//3 更新复诊记录
205		- fuZhenUpdate(model, antenatalExaminationModel, antenatalExaminationModel1);
	209	+ if("2100001291".equals(antenatalExaminationModel.getHospitalId())){
	210	+ fuZhenUpdate(model, antenatalExaminationModel, antenatalExaminationModel1);
	211	+ }else if("216".equals(antenatalExaminationModel.getHospitalId())){
	212	+ fuZhenQHDUpdate(model, antenatalExaminationModel, antenatalExaminationModel1);
	213	+ }
206	214	antExService.updateOneAnt(antenatalExaminationModel1,antenatalExaminationModel.getId());
207	215	}
208	216	}
209	217
210	218	/**
211		- * 更新复诊记录
	219	+ * 承德妇幼更新复诊记录
212	220	* @param model
213	221	* @param antenatalExaminationModel
214	222	* @param antenatalExaminationModel1
215	223
216	224
...	...	@@ -264,9 +272,37 @@
264	272	}
265	273
266	274	}
	275	+ /**
	276	+ * 秦皇岛妇幼更新复诊记录
	277	+ * @param model
	278	+ * @param antenatalExaminationModel
	279	+ * @param antenatalExaminationModel1
	280	+ */
	281	+ private void fuZhenQHDUpdate(LisReportModel model, AntenatalExaminationModel antenatalExaminationModel, AntenatalExaminationModel antenatalExaminationModel1) {
	282	+ if("".equals(antenatalExaminationModel.getHemoglobin()) \|\| antenatalExaminationModel.getHemoglobin()==null){
	283	+ antenatalExaminationModel1.setHemoglobin(getCodeValue(model, "HGB")); //血红蛋白
	284	+ }
	285	+ if("".equals(antenatalExaminationModel.getUrineProtein()) \|\| antenatalExaminationModel.getUrineProtein()==null){
	286	+ antenatalExaminationModel1.setUrineProtein(getCodeValue(model, "PRO-U")); //尿蛋白
	287	+ }
	288	+ if("".equals(antenatalExaminationModel.getBloodSugar()) \|\| antenatalExaminationModel.getBloodSugar()==null){
	289	+ antenatalExaminationModel1.setBloodSugar(getCodeValue(model, "GLUK")); //血糖
	290	+ }
	291	+ if("".equals(antenatalExaminationModel.getBloodSugar2()) \|\| antenatalExaminationModel.getBloodSugar2()==null){
	292	+ antenatalExaminationModel1.setBloodSugar2(getCodeValue(model, "GLU1h")); // 血糖2
	293	+ }
	294	+ if("".equals(antenatalExaminationModel.getBloodSugar3()) \|\| antenatalExaminationModel.getBloodSugar3()==null){
	295	+ antenatalExaminationModel1.setBloodSugar3(getCodeValue(model, "GLU2h")); // 血糖3
	296	+ }
	297	+ if("".equals(antenatalExaminationModel.getBloodSugar4()) \|\| antenatalExaminationModel.getBloodSugar4()==null){
	298	+ antenatalExaminationModel1.setBloodSugar4(getCodeValue(model, "GLU3h")); // 血糖4
	299	+ }
267	300
	301	+ }
	302	+
	303	+
268	304	/**
269		- * 更新初诊记录
	305	+ * 承德妇幼更新初诊记录
270	306	* @param model
271	307	* @param antExChuModel
272	308	* @param antExChuModel1
273	309
274	310
275	311
276	312
277	313
...	...	@@ -393,16 +429,123 @@
393	429	}
394	430
395	431	}
	432	+ /**
	433	+ * 秦皇岛妇幼更新初诊记录
	434	+ * @param model
	435	+ * @param antExChuModel
	436	+ * @param antExChuModel1
	437	+ */
	438	+ private void antExChuModelQHDUpadte(LisReportModel model, AntExChuModel antExChuModel, AntExChuModel antExChuModel1) {
	439	+ if("".equals(antExChuModel.getXhdb()) \|\| antExChuModel.getXhdb()==null){//血红蛋白
	440	+ antExChuModel1.setXhdb(getCodeValue(model, "HGB"));
	441	+ }
	442	+ if("".equals(antExChuModel.getBxbjs()) \|\| antExChuModel.getBxbjs()==null){//白细胞计数
	443	+ antExChuModel1.setBxbjs(getCodeValue(model, "WBC"));
	444	+ }
	445	+ if("".equals(antExChuModel.getPlatelet()) \|\| antExChuModel.getPlatelet()==null){//血小板
	446	+ antExChuModel1.setPlatelet(getCodeValue(model, "PLT"));
	447	+ }
396	448
	449	+ if("".equals(antExChuModel.getNdb()) \|\| antExChuModel.getNdb()==null){//尿蛋白
	450	+ antExChuModel1.setNdb(getCodeValue(model, "PRO-U"));
	451	+ }
	452	+ if("".equals(antExChuModel.getNt()) \|\| antExChuModel.getNt()==null){ //尿糖
	453	+ antExChuModel1.setNt(getCodeValue(model, "GLU-U"));
	454	+ }
	455	+ if("".equals(antExChuModel.getUrineKetone()) \|\| antExChuModel.getUrineKetone()==null){//尿酮体
	456	+ antExChuModel1.setUrineKetone(getCodeValue(model, "KET-U"));
	457	+ }
	458	+ if("".equals(antExChuModel.getBld()) \|\| antExChuModel.getBld()==null){//尿潜血
	459	+ antExChuModel1.setBld(getCodeValue(model, "ERY"));
	460	+ }
397	461
	462	+ if("".equals(antExChuModel.getAbo()) \|\| antExChuModel.getAbo()==null){//血型
	463	+ antExChuModel1.setAbo(getCodeValue(model, "ABOType"));
	464	+ }
	465	+ if("".equals(antExChuModel.getRh()) \|\| antExChuModel.getRh()==null){//RH血型
	466	+ antExChuModel1.setRh(getCodeValue(model, "RHDType"));
	467	+ }
	468	+ if("".equals(antExChuModel.getBloodSugar()) \|\| antExChuModel.getBloodSugar()==null){//血糖
	469	+ antExChuModel1.setBloodSugar(getCodeValue(model, "GLU"));
	470	+ }
	471	+
	472	+ if("".equals(antExChuModel.getXqgbzam()) \|\| antExChuModel.getXqgbzam()==null){//血清谷丙转氨酶
	473	+ antExChuModel1.setXqgbzam(getCodeValue(model, "ALT."));
	474	+ }
	475	+ if("".equals(antExChuModel.getXqgczam()) \|\| antExChuModel.getXqgczam()==null){//血清谷草转氨酶
	476	+ antExChuModel1.setXqgczam(getCodeValue(model, "AST."));
	477	+ }
	478	+
	479	+ if("".equals(antExChuModel.getAlbumin()) \|\| antExChuModel.getAlbumin()==null){//白蛋白
	480	+ antExChuModel1.setAlbumin(getCodeValue(model, "ALB"));
	481	+ }
	482	+ if("".equals(antExChuModel.getTotalBilirubin()) \|\| antExChuModel.getTotalBilirubin()==null){//总胆红素
	483	+ antExChuModel1.setTotalBilirubin(getCodeValue(model, "TBil"));
	484	+ }
	485	+ if("".equals(antExChuModel.getJhBilirubin()) \|\| antExChuModel.getJhBilirubin()==null){//结合胆红素
	486	+ antExChuModel1.setJhBilirubin(getCodeValue(model, "DBIL"));
	487	+ }
	488	+ if("".equals(antExChuModel.getBg()) \|\| antExChuModel.getBg()==null){//丙肝
	489	+ antExChuModel1.setBg(getCodeValue(model, "HCV"));
	490	+ }
	491	+
	492	+ if("".equals(antExChuModel.getYgbmky()) \|\| antExChuModel.getYgbmky()==null){//乙肝表面抗原
	493	+ antExChuModel1.setYgbmky(getCodeValue(model, "HBsAg.."));
	494	+ }
	495	+ if("".equals(antExChuModel.getYgbmkt()) \|\| antExChuModel.getYgbmkt()==null){//乙肝表面抗体
	496	+ antExChuModel1.setYgbmkt(getCodeValue(model, "HBsAb."));
	497	+ }
	498	+ if("".equals(antExChuModel.getYgeky()) \|\| antExChuModel.getYgeky()==null){//乙肝e抗原
	499	+ antExChuModel1.setYgeky(getCodeValue(model, "HBeAg."));
	500	+ }
	501	+ if("".equals(antExChuModel.getYgekt()) \|\| antExChuModel.getYgekt()==null){//乙肝e抗体
	502	+ antExChuModel1.setYgekt(getCodeValue(model, "HBEAB"));
	503	+ }
	504	+ if("".equals(antExChuModel.getYghxkt()) \|\| antExChuModel.getYghxkt()==null){//乙肝核心抗体
	505	+ antExChuModel1.setYghxkt(getCodeValue(model, "HBcAb."));
	506	+ }
	507	+
	508	+ if("".equals(antExChuModel.getXqjq()) \|\| antExChuModel.getXqjq()==null){//血清肌
	509	+ antExChuModel1.setXqjq(getCodeValue(model, "Cr"));
	510	+ }
	511	+ if("".equals(antExChuModel.getXnsd()) \|\| antExChuModel.getXnsd()==null){//血尿素氮
	512	+ antExChuModel1.setXnsd(getCodeValue(model, "BUN"));
	513	+ }
	514	+
	515	+ if("".equals(antExChuModel.getSyjg()) \|\| antExChuModel.getSyjg()==null){//实验结果
	516	+ antExChuModel1.setSyjg(getCodeValue(model, "TPAb"));
	517	+ }
	518	+ if("".equals(antExChuModel.getHivkt()) \|\| antExChuModel.getHivkt()==null){//hit抗体检测
	519	+ antExChuModel1.setHivkt(getCodeValue(model, "HIV."));
	520	+ }
	521	+
	522	+ //阴道分泌物
	523	+ if("".equals(antExChuModel.getYdqjd()) \|\| antExChuModel.getYdqjd()==null){//阴道清洁度
	524	+ antExChuModel1.setYdqjd(getCodeValue(model, "QJD"));
	525	+ }
	526	+
	527	+ //甲状腺功能 FT3 FT4 TSH TpaAb TgAb A-TSHR 辅助检查没有该内容code
	528	+
	529	+ }
	530	+
	531	+
	532	+
398	533	private String getCodeValue(LisReportModel model, String codeStr) {
	534	+ if("".equals(model.getItemJson())\|\| model.getItemJson()==null){
	535	+ return null;
	536	+ }
399	537	JSONArray jsonArray=JSONArray.fromObject(model.getItemJson());
400	538	for (int i = 0; i < jsonArray.size(); i++) {
401	539	Object o=jsonArray.get(i);
402	540	JSONObject jsonObject2=JSONObject.fromObject(o);
403	541	String code = (String)jsonObject2.get("code");
	542	+ code = code.trim();
404	543	if (code.equals(codeStr)){
405		- return (String)jsonObject2.get("result");
	544	+ if("".equals((String)jsonObject2.get("result"))){
	545	+ return (String)jsonObject2.get("numberResult");
	546	+ }else {
	547	+ return (String)jsonObject2.get("result");
	548	+ }
406	549	}
407	550	}
408	551	return null;

...	...	@@ -10,7 +10,7 @@
10	10	/**
11	11	* 孕产妇体重管理
12	12	*/
13		-@Document(collection="lyms_patient_weight")
	13	+@Document(collection = "lyms_patient_weight")
14	14	public class PatientWeight extends BaseModel {
15	15
16	16	@Transient
...	...	@@ -129,6 +129,28 @@
129	129
130	130	//0 未推送 1已经推送
131	131	private Integer sevenSend;
	132	+
	133	+ //打印时间
	134	+ private Date printingTime;
	135	+
	136	+ //
	137	+ private boolean printing;
	138	+
	139	+ public boolean isPrinting() {
	140	+ return printing;
	141	+ }
	142	+
	143	+ public void setPrinting(boolean printing) {
	144	+ this.printing = printing;
	145	+ }
	146	+
	147	+ public Date getPrintingTime() {
	148	+ return printingTime;
	149	+ }
	150	+
	151	+ public void setPrintingTime(Date printingTime) {
	152	+ this.printingTime = printingTime;
	153	+ }
132	154
133	155	public Integer getExceptionSend() {
134	156	return exceptionSend;

...	...	@@ -33,6 +33,16 @@
33	33
34	34	private String temporaryUserId;
35	35
	36	+ private Date printingTime;
	37	+
	38	+ public Date getPrintingTime() {
	39	+ return printingTime;
	40	+ }
	41	+
	42	+ public void setPrintingTime(Date printingTime) {
	43	+ this.printingTime = printingTime;
	44	+ }
	45	+
36	46	// 存储 key=年月日 value=时间+医院+体重
37	47	private List<Map<String, Object>> dayWeights2 = new ArrayList<>();
38	48

...	...	@@ -84,8 +84,8 @@
84	84	@ResponseBody
85	85	@TokenRequired
86	86	@RequestMapping(value = "/all", method = RequestMethod.GET)
87		- public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer type, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) {
88		- return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, page, limit, getUserId(request), type);
	87	+ public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer type, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request, Integer check) {
	88	+ return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, page, limit, getUserId(request), type, check);
89	89	}
90	90
91	91	@ResponseBody
...	...	@@ -111,6 +111,7 @@
111	111
112	112	/**
113	113	* 手动执行自动任务
	114	+ *
114	115	* @return
115	116	*/
116	117	@ResponseBody

...	...	@@ -1308,6 +1308,12 @@
1308	1308	Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
1309	1309	map.put("hospitalName", org.getName());
1310	1310	map.put("reportMonthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), model.getNutritiTime())));
	1311	+ //体重评价
	1312	+ String weightEvaluate = babyCheckFacade.getGrowthValue(DateUtil.getyyyy_MM_dd(baby.getBirth()), model.getWeight(), baby.getSex(), null, null, DateUtil.getyyyy_MM_dd(baby.getCreated()));
	1313	+ map.put("weightEvaluate", weightEvaluate);
	1314	+ //身高评价
	1315	+ String heightEvaluate = babyCheckFacade.getGrowthValue1(DateUtil.getyyyy_MM_dd(baby.getBirth()), model.getHeight(), baby.getSex(), 1, null, DateUtil.getyyyy_MM_dd(baby.getCreated()));
	1316	+ map.put("heightEvaluate", heightEvaluate);
1311	1317
1312	1318	int month = DateUtil.getMonth(baby.getBirth(), model.getNutritiTime());
1313	1319	if (month > 36) {

...	...	@@ -825,6 +825,7 @@
825	825	jsonObject.put("P_DOCID", "2100004880");
826	826	//让写死桃城区，董勤说最后定
827	827	jsonObject.put("P_FILINGTIME", sdf.format(patients.getBookbuildingDate()));//建档时间
	828	+ jsonObject.put("P_TOWNSHIP", "");//现居住乡镇晓东后来让加的
828	829
829	830	if (patients.getReqHusband() != null) {//丈夫信息是否必须
830	831	if (patients.getReqHusband()) {

...	...	@@ -338,9 +338,12 @@
338	338	/**
339	339	* 栾平妇幼定制
340	340	* */
341		- if ("2100001377".equals(hospitalId)) {
342		- siveStatus = "已产筛";
	341	+ for (SieveModel sieve : list) {
	342	+ if ("2100001377".equals(hospitalId) && sieve.getStatus() == 3) {
	343	+ siveStatus = "已产筛";
	344	+ }
343	345	}
	346	+
344	347
345	348	} else {
346	349	SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();

...	...	@@ -14,7 +14,7 @@
14	14	* @version BME V100R001 2018-01-17 17:05
15	15	* @since BME V100R001C40B104
16	16	*/
17		-public class TrackDownQueryRequest extends BasePageQueryRequest{
	17	+public class TrackDownQueryRequest extends BasePageQueryRequest {
18	18	private String provinceId;
19	19	private String cityId;
20	20	private String areaId;
...	...	@@ -45,6 +45,70 @@
45	45	private Date startDueDate;
46	46	//开始预产期
47	47	private Date endDueDate;
	48	+
	49	+ /**
	50	+ * 新加查询条件
	51	+ */
	52	+ //追访日期
	53	+ private Date startChaseVisit;
	54	+ private Date endChaseVisit;
	55	+
	56	+ //逾期天数
	57	+ private Integer startBeOverdue;
	58	+ private Integer endBeOverdue;
	59	+ //流程状态
	60	+ private Integer processState;
	61	+ //追访方式
	62	+ private Integer ChaseVisitMode;
	63	+
	64	+
	65	+ public Date getStartChaseVisit() {
	66	+ return startChaseVisit;
	67	+ }
	68	+
	69	+ public void setStartChaseVisit(Date startChaseVisit) {
	70	+ this.startChaseVisit = startChaseVisit;
	71	+ }
	72	+
	73	+ public Date getEndChaseVisit() {
	74	+ return endChaseVisit;
	75	+ }
	76	+
	77	+ public void setEndChaseVisit(Date endChaseVisit) {
	78	+ this.endChaseVisit = endChaseVisit;
	79	+ }
	80	+
	81	+ public Integer getStartBeOverdue() {
	82	+ return startBeOverdue;
	83	+ }
	84	+
	85	+ public void setStartBeOverdue(Integer startBeOverdue) {
	86	+ this.startBeOverdue = startBeOverdue;
	87	+ }
	88	+
	89	+ public Integer getEndBeOverdue() {
	90	+ return endBeOverdue;
	91	+ }
	92	+
	93	+ public void setEndBeOverdue(Integer endBeOverdue) {
	94	+ this.endBeOverdue = endBeOverdue;
	95	+ }
	96	+
	97	+ public Integer getProcessState() {
	98	+ return processState;
	99	+ }
	100	+
	101	+ public void setProcessState(Integer processState) {
	102	+ this.processState = processState;
	103	+ }
	104	+
	105	+ public Integer getChaseVisitMode() {
	106	+ return ChaseVisitMode;
	107	+ }
	108	+
	109	+ public void setChaseVisitMode(Integer chaseVisitMode) {
	110	+ ChaseVisitMode = chaseVisitMode;
	111	+ }
48	112
49	113	public String getCheckDoctor() {
50	114	return checkDoctor;

...	...	@@ -8,17 +8,17 @@
8	8	import javax.servlet.http.HttpServletResponse;
9	9	import java.util.Date;
10	10
11		-public interface ITrackDownService extends IBaseService {
	11	+public interface ITrackDownService extends IBaseService {
12	12	//新增或更新追访状态
13		- boolean addOrupdateTrackDownRecord(Integer userId,TrackDownRecord trackDownRecord);
	13	+ boolean addOrupdateTrackDownRecord(Integer userId, TrackDownRecord trackDownRecord);
14	14
15	15	BaseResponse add(Integer userId, TrackDown trackDown);
16	16
17	17	BaseObjectResponse list(String provinceId, String cityId, String areaId, String streetId, String key, Integer trackType, Integer page, Integer limit, Integer userId);
18	18
19		- BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId,Integer type);
	19	+ BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId, Integer type, Integer check);
20	20
21		- BaseObjectResponse info(String patientId, Integer trackType,Integer buildType);
	21	+ BaseObjectResponse info(String patientId, Integer trackType, Integer buildType);
22	22
23	23	BaseObjectResponse init();
24	24

...	...	@@ -362,6 +362,16 @@
362	362	} else {
363	363	map.put("isShow", false);
364	364	}
	365	+ if (null != patientWeight.getPrintingTime()) {
	366	+ int hasPrint = DateUtil.getDays(patientWeight.getPrintingTime(), new Date());
	367	+ if (hasPrint > 7) {
	368	+ map.put("hasPrintInWeek", false);
	369	+ } else {
	370	+ map.put("hasPrintInWeek", true);
	371	+ }
	372	+ } else {
	373	+ map.put("hasPrintInWeek", false);
	374	+ }
365	375
366	376	setReport(map, weights, patientWeight.getBeforeWeight(), patientWeight.getBmi(), patientWeight.getDayWeights(), patientWeight.getBregmatic());
367	377
...	...	@@ -433,6 +443,17 @@
433	443	patientWeight.setIsShow(false);
434	444	}
435	445
	446	+ if (null != patientWeight.getPrintingTime()) {
	447	+ int hasPrint = DateUtil.getDays(patientWeight.getPrintingTime(), new Date());
	448	+ if (hasPrint > 7) {
	449	+ patientWeight.setPrinting(false);
	450	+ } else {
	451	+ patientWeight.setPrinting(true);
	452	+ }
	453	+ } else {
	454	+ patientWeight.setPrinting(false);
	455	+ }
	456	+
436	457	return RespBuilder.buildSuccess(patientWeight);
437	458	}
438	459
...	...	@@ -653,7 +674,7 @@
653	674	setYYZN(map, ComputeKulServiceManager.getPatientGuideMap().get(rid + nsArea));
654	675
655	676	}
656		- map.put("state",kmap.get("status"));
	677	+ map.put("state", kmap.get("status"));
657	678
658	679	}
659	680	}
...	...	@@ -673,6 +694,10 @@
673	694	String doctorId = getDoctorId(dayWeights2);
674	695
675	696	healthChargeFacade.addHealthCharge(hospitalId, 1, patientWeight.getPatientId(), 1, 1, userId, doctorId, false);
	697	+ PatientWeight patientWeight1 = new PatientWeight();
	698	+ patientWeight1.setPrintingTime(new Date());
	699	+ patientWeightService2.update(Query.query(Criteria.where("_id").is(id)), patientWeight1);
	700	+
676	701	return RespBuilder.buildSuccess(map);
677	702	}
678	703	return RespBuilder.buildSuccess();
...	...	@@ -2161,6 +2186,10 @@
2161	2186	}
2162	2187	}
2163	2188	healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(), 1, patientWeight.getPatientId(), 2, 1, userId, doctorId, false);
	2189	+
	2190	+ PatientWeight patientWeight1 = new PatientWeight();
	2191	+ patientWeight1.setPrintingTime(new Date());
	2192	+ patientWeightService2.update(Query.query(Criteria.where("_id").is(pid)), patientWeight1);
2164	2193	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas));
2165	2194	}
2166	2195

...	...	@@ -369,6 +369,18 @@
369	369	} else {
370	370	map.put("isShow", false);
371	371	}
	372	+ //限制一周能打印
	373	+ if (null != template.getPrintingTime()) {
	374	+ int hasPrint = DateUtil.getDays(template.getPrintingTime(), new Date());
	375	+ if (hasPrint > 7) {
	376	+ map.put("hasPrintInWeek", false);
	377	+ } else {
	378	+ map.put("hasPrintInWeek", true);
	379	+ }
	380	+ } else {
	381	+ map.put("hasPrintInWeek", false);
	382	+ }
	383	+
372	384	patientWeightService.setReport(map, weights, temporaryUser.getBeforeWeight(), template.getBmi(), template.getDayWeights(), temporaryUser.getBregmatic());
373	385
374	386	//高危报告权限判断
375	387
...	...	@@ -490,8 +502,12 @@
490	502	CollectionUtils.removeNullValue(map);
491	503	List<Map<String, Object>> dayWeights2 = temporaryWeight.getDayWeights2();
492	504	String doctorId = patientWeightService.getDoctorId(dayWeights2);
493		-
494	505	healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId, doctorId, false);
	506	+
	507	+ TemporaryWeightModel patientWeight1 = new TemporaryWeightModel();
	508	+ patientWeight1.setPrintingTime(new Date());
	509	+ temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(id)), patientWeight1);
	510	+
495	511	return RespBuilder.buildSuccess(map);
496	512	}
497	513	return RespBuilder.buildSuccess();
...	...	@@ -838,6 +854,9 @@
838	854	String doctorId = patientWeightService.getDoctorId(dayWeights2);
839	855
840	856	healthChargeFacade.addHealthCharge(hospitalId, 1, temporary.getTemporaryUserId(), 2, 2, userId, doctorId, false);
	857	+ TemporaryWeightModel patientWeight1 = new TemporaryWeightModel();
	858	+ patientWeight1.setPrintingTime(new Date());
	859	+ temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(id)), patientWeight1);
841	860	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas));
842	861	}
843	862

...	...	@@ -67,7 +67,7 @@
67	67	* @return
68	68	*/
69	69	@Override
70		- public BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId, Integer type) {
	70	+ public BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId, Integer type, Integer check) {
71	71	String hospitalId = autoMatchFacade.getHospitalId(userId);
72	72	List<Map<String, Object>> restList = new ArrayList<>();
73	73	Integer archiveModelCount = 0;
74	74
75	75
...	...	@@ -89,15 +89,39 @@
89	89	// StopWatch stopWatch = new StopWatch("妇女建档主数据");
90	90	//优化前
91	91	// stopWatch.start("妇女建档优化前");
92		- restList = getResidentMainData(modelList);
	92	+ if (null != check) {
	93	+ List<Map<String, Object>> checkList = getResidentMainData(modelList);
	94	+ //婚检过
	95	+ if (check == 1) {
	96	+ for (Map<String, Object> checkMap : checkList) {
	97	+ if ((int) checkMap.get("check") == 1) {
	98	+ restList.add(checkMap);
	99	+ }
	100	+ }
	101	+
	102	+ } else if (check == 2) {
	103	+ for (Map<String, Object> checkMap : checkList) {
	104	+ if ((int) checkMap.get("check") == 2) {
	105	+ restList.add(checkMap);
	106	+ }
	107	+ }
	108	+ }
	109	+
	110	+ } else {
	111	+ restList = getResidentMainData(modelList);
	112	+ }
	113	+
	114	+
93	115	// stopWatch.stop();
94	116	//优化后
95	117	// stopWatch.start("妇女建档优化后");
96	118	// restList = dispResidentMainData(modelList,hospitalId);
97	119	// stopWatch.stop();
98		- // archiveModelCount = query.getCount();
	120	+ archiveModelCount = query.getCount();
99	121	//
100	122	// System.out.println(stopWatch.toString());
	123	+
	124	+
101	125	} else {//孕妇建档主数据
102	126	PatientsQuery patientsQuery = new PatientsQuery();
103	127	patientsQuery.setBookbuildingDateStart(checkStart);
...	...	@@ -121,7 +145,7 @@
121	145	// System.out.println(stopWatch.toString());
122	146	//优化后
123	147	stopWatch.start("孕妇建档优化后");
124		- restList = dispPatient(patientsList,hospitalId);
	148	+ restList = dispPatient(patientsList, hospitalId);
125	149	stopWatch.stop();
126	150	System.out.println(stopWatch.toString());
127	151
128	152
...	...	@@ -191,10 +215,10 @@
191	215	trackDownRecord = records.get(0);
192	216	}
193	217	}
194		- if(checkNum>0){
	218	+ if (checkNum > 0) {
195	219	temp.put("check", 1); // 婚检 1=勾勾 2=叉叉
196		- }else{
197		- if (trackDownRecord!=null && trackDownRecord.getTrackType() > TrackDownDateEnums.A.getId()) {
	220	+ } else {
	221	+ if (trackDownRecord != null && trackDownRecord.getTrackType() > TrackDownDateEnums.A.getId()) {
198	222	temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉
199	223	}
200	224	}
201	225
...	...	@@ -315,10 +339,10 @@
315	339	}
316	340	}
317	341
318		- if(checkNum>0){
	342	+ if (checkNum > 0) {
319	343	temp.put("check", 1); // 婚检 1=勾勾 2=叉叉
320		- }else{
321		- if (trackDownRecord!=null && trackDownRecord.getTrackType() > TrackDownDateEnums.A.getId()) {
	344	+ } else {
	345	+ if (trackDownRecord != null && trackDownRecord.getTrackType() > TrackDownDateEnums.A.getId()) {
322	346	temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉
323	347	}
324	348	}
...	...	@@ -366,7 +390,7 @@
366	390	/** 生产方式 */
367	391	temp.put("fmType", "自动分娩");
368	392	temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
369		- }else if(patient.getType() == 3){//可能本院分娩或外院分娩
	393	+ } else if (patient.getType() == 3) {//可能本院分娩或外院分娩
370	394	temp.put("fm", 2); // 默认外院分娩
371	395	}
372	396	}
373	397
...	...	@@ -385,13 +409,13 @@
385	409	if (patient.getType() == 3) {//已经分娩，就是X
386	410	temp.put("cqsc", 2);//产前筛查){
387	411	} else {//未分娩
388		- if(patient.getLastMenses()!=null){
	412	+ if (patient.getLastMenses() != null) {
389	413	int week = DateUtil.getWeek2(patient.getLastMenses(), new Date());
390	414	if (week > 20) {//不能做产前筛查追访，产前检查追访
391	415	temp.put("cqsc", 2);//未做产筛
392	416	}
393		- }else{
394		- System.out.println("没有末次月经的建档："+patient.getId());
	417	+ } else {
	418	+ System.out.println("没有末次月经的建档：" + patient.getId());
395	419	}
396	420	}
397	421
...	...	@@ -690,7 +714,7 @@
690	714	TrackDownRecord trackDownRecord1 = trackDownRecordService.getTrackDown(trackDownRecord.getId());
691	715	if (trackDownRecord1 != null) {
692	716	//流程只能往下流转，不能往上回退,，因为9,10,11,12,是后面加入的产筛转出流程所以不做判断
693		- if (trackDownRecord.getTrackType() != null && trackDownRecord1.getTrackType()!=8 && trackDownRecord1.getTrackType()!=9 && trackDownRecord1.getTrackType()!=10&&trackDownRecord1.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) {
	717	+ if (trackDownRecord.getTrackType() != null && trackDownRecord1.getTrackType() != 8 && trackDownRecord1.getTrackType() != 9 && trackDownRecord1.getTrackType() != 10 && trackDownRecord1.getTrackType() != 11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) {
694	718	//用以前追访的类型和来源id
695	719	trackDownRecord.setTrackType(trackDownRecord1.getTrackType());
696	720	trackDownRecord.setSource(trackDownRecord1.getSource());