jiangjiazhi / regional-platform

Commit fb7682fe74c243feca8da502bf69f24d6a851cd7

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

唐山滦县产妇健康管理登记表

Showing 4 changed files with 48 additions and 7 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java

...	...	@@ -472,10 +472,9 @@
472	472	ws.addCell(new Label(k + 10, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString()));
473	473
474	474	ws.addCell(new Label(k + 11, i + 2, data.get(i).get("cyxj") == null ? "" : data.get(i).get("cyxj").toString()));
475		- ws.addCell(new Label(k + 12, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString()));
476		- ws.addCell(new Label(k + 13, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString()));
477		- ws.addCell(new Label(k + 14, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString()));
478		- ws.addCell(new Label(k + 15, i + 2, data.get(i).get("total") == null ? "" : data.get(i).get("total").toString()));
	475	+ ws.addCell(new Label(k + 12, i + 2, data.get(i).get("chfs") == null ? "" : data.get(i).get("chfs").toString()));
	476	+ ws.addCell(new Label(k + 13, i + 2, data.get(i).get("chfc") == null ? "" : data.get(i).get("chfc").toString()));
	477	+ ws.addCell(new Label(k + 14, i + 2, data.get(i).get("remarks") == null ? "" : data.get(i).get("remarks").toString()));
479	478
480	479	}
481	480	}

...	...	@@ -104,8 +104,9 @@
104	104
105	105	@Autowired
106	106	private DischargeAbstractMotherService dischargeAbstractMotherService;
	107	+ @Autowired
	108	+ private MatDeliverFollowService matDeliverFollowService;
107	109
108		-
109	110	/**
110	111	* 修改产妇的社区
111	112	*
...	...	@@ -745,7 +746,7 @@
745	746	if (end > patientses.size()) {
746	747	end = patientses.size();
747	748	}
748		- listFuture.add(commonThreadPool.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService,antExService,dischargeAbstractMotherService)));
	749	+ listFuture.add(commonThreadPool.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService,antExService,dischargeAbstractMotherService,matDeliverFollowService)));
749	750	}
750	751	for (Future f : listFuture) {
751	752	try {
...	...	@@ -1091,6 +1092,8 @@
1091	1092	data.put("wu",rp.getWu());
1092	1093	data.put("total", rp.getcTimes());
1093	1094	data.put("cyxj",rp.getCyxj());
	1095	+ data.put("chfs",rp.getChfs());
	1096	+ data.put("chfc",rp.getChfc());
1094	1097
1095	1098	datas.add(data);
1096	1099	}

...	...	@@ -77,6 +77,8 @@
77	77	private String si;
78	78	private String wu;
79	79	private String cyxj;
	80	+ private String chfs;
	81	+ private String chfc;
80	82
81	83	public String getLastMenses() {
82	84	return lastMenses;
...	...	@@ -140,6 +142,22 @@
140	142
141	143	public void setCyxj(String cyxj) {
142	144	this.cyxj = cyxj;
	145	+ }
	146	+
	147	+ public String getChfs() {
	148	+ return chfs;
	149	+ }
	150	+
	151	+ public void setChfs(String chfs) {
	152	+ this.chfs = chfs;
	153	+ }
	154	+
	155	+ public String getChfc() {
	156	+ return chfc;
	157	+ }
	158	+
	159	+ public void setChfc(String chfc) {
	160	+ this.chfc = chfc;
143	161	}
144	162
145	163	public String getFileCode() {

...	...	@@ -48,6 +48,7 @@
48	48	private OrganizationService organizationService;
49	49	private BasicConfigService basicConfigService;
50	50	private DischargeAbstractMotherService dischargeAbstractMotherService;
	51	+ private MatDeliverFollowService matDeliverFollowService;
51	52
52	53	public QuanChanPatientWorker(List<Patients> patientses,
53	54	String hospital,
...	...	@@ -55,7 +56,8 @@
55	56	PostReviewService postReviewService,
56	57	MatDeliverService matDeliverService, PatientsService patientsService,
57	58	OrganizationService organizationService, BasicConfigService basicConfigService,
58		- AntenatalExaminationService antExService,DischargeAbstractMotherService dischargeAbstractMotherService) {
	59	+ AntenatalExaminationService antExService,DischargeAbstractMotherService dischargeAbstractMotherService,
	60	+ MatDeliverFollowService matDeliverFollowService) {
59	61	this.patientses = patientses;
60	62	this.matDeliverService = matDeliverService;
61	63	this.postReviewService = postReviewService;
...	...	@@ -156,6 +158,25 @@
156	158	chanResult.setCyxj("有");
157	159	}else{
158	160	chanResult.setCyxj("无");
	161	+ }
	162	+ //产后访视
	163	+ MatDeliverFollowQuery mfQuery = new MatDeliverFollowQuery();
	164	+ mfQuery.setPid(patients.getPid());
	165	+ List<MatdeliverFollowModel> maternalDeliverList = matDeliverFollowService.query(mfQuery);
	166	+ if(maternalDeliverList != null && maternalDeliverList.size() > 0){
	167	+ chanResult.setChfs("有");
	168	+ }else{
	169	+ chanResult.setChfs("无");
	170	+ }
	171	+ PostReviewQuery pReviewQuery = new PostReviewQuery();
	172	+ pReviewQuery.setYn(YnEnums.YES.getId());
	173	+ pReviewQuery.setParentId(patients.getId());
	174	+ //产后复查记录
	175	+ List<PostReviewModel> reviewModels = postReviewService.findWithList(pReviewQuery);
	176	+ if(reviewModels != null && reviewModels.size() > 0){
	177	+ chanResult.setChfc("有");
	178	+ }else{
	179	+ chanResult.setChfc("无");
159	180	}
160	181
161	182