jiangjiazhi / regional-platform

Authored by yangfei about 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 34 additions and 5 deletions

...	...	@@ -883,6 +883,12 @@
883	883	antExQuery.setParentId(patients.getId());
884	884	antExQuery.setYn(YnEnums.YES.getId());
885	885	List<AntenatalExaminationModel> examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
	886	+
	887	+ AntExChuQuery antExChuQuery = new AntExChuQuery();
	888	+ antExChuQuery.setYn(YnEnums.YES.getId());
	889	+ antExChuQuery.setParentId(patients.getId());
	890	+ List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
	891	+
886	892	HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
887	893	try {
888	894	String tTireNumber = "";
889	895
...	...	@@ -892,13 +898,15 @@
892	898	tTireNumber = examinationModel.get(0).getTireNumber();
893	899	}
894	900	} else {
895		- AntExChuQuery antExChuQuery = new AntExChuQuery();
896		- antExChuQuery.setYn(YnEnums.YES.getId());
897		- antExChuQuery.setParentId(patients.getId());
898		- List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
899	901	if (CollectionUtils.isNotEmpty(antExChuModels)) {
900	902	tTireNumber = antExChuModels.get(0).getTireNumber();
901	903	}
	904	+ }
	905	+
	906	+ if (CollectionUtils.isNotEmpty(antExChuModels)) {
	907	+ matDeliverListResult.setDueCount(antExChuModels.get(0).getProdTime() == null ? 1 : antExChuModels.get(0).getProdTime()+1);
	908	+ }else{
	909	+ matDeliverListResult.setDueCount(1);
902	910	}
903	911
904	912	matDeliverListResult.setRiskFactor(highScoreResult.getHighRisk());

...	...	@@ -3,7 +3,6 @@
3	3	import com.lyms.platform.common.utils.DateUtil;
4	4	import com.lyms.platform.pojo.MaternalDeliverModel;
5	5	import com.lyms.platform.pojo.Patients;
6		-import org.apache.commons.collections.CollectionUtils;
7	6
8	7	import java.util.ArrayList;
9	8	import java.util.Date;
...	...	@@ -48,6 +47,9 @@
48	47
49	48	// 胎数
50	49	private String tireNumber1;
	50	+ // 产次
	51	+ private Integer dueCount;
	52	+
51	53	private String status="0";
52	54
53	55	//分娩时间，补录时使用
...	...	@@ -57,6 +59,14 @@
57	59	private String pid;
58	60	private String cardNo;
59	61	private String vcCardNo;
	62	+
	63	+ public Integer getDueCount() {
	64	+ return dueCount;
	65	+ }
	66	+
	67	+ public void setDueCount(Integer dueCount) {
	68	+ this.dueCount = dueCount;
	69	+ }
60	70
61	71	public String getVcCardNo() {
62	72	return vcCardNo;

...	...	@@ -22,6 +22,8 @@
22	22	private String dueDate;
23	23	//分娩孕周
24	24	private String dueWeek;
	25	+ // 产次
	26	+ private Integer dueCount;
25	27	//台数
26	28	private Integer tireNumber;
27	29	//胎盘
28	30
...	...	@@ -84,11 +86,20 @@
84	86	return deathCauseText;
85	87	}
86	88
	89	+ public Integer getDueCount() {
	90	+ return dueCount;
	91	+ }
	92	+
	93	+ public void setDueCount(Integer dueCount) {
	94	+ this.dueCount = dueCount;
	95	+ }
	96	+
87	97	public void setDeathCauseText(String deathCauseText) {
88	98	this.deathCauseText = deathCauseText;
89	99	}
90	100
91	101	public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) {
	102	+ setDueCount(destModel.getDueCount());
92	103	setFmAddr(destModel.getFmAddr());
93	104	setFmType(destModel.getFmType());
94	105	setId(destModel.getId());