jiangjiazhi / regional-platform

Commit 4906f943762f1c8fe6d45449db97bc1d9fc6467b

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

出院小结，卡介苗，乙肝育苗分组

Showing 5 changed files with 130 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java

...	...	@@ -55,7 +55,28 @@
55	55	*/
56	56	private Integer isHBV;
57	57
	58	+ /** 2018年3月21日要求进行分离
	59	+ * 卡介苗接种日期
	60	+ */
	61	+ private Date bCGVaccinDate;
58	62	/**
	63	+ * 2018年3月21日要求进行分离
	64	+ * 乙肝疫苗接种日期
	65	+ */
	66	+ private Date hbvVaccinDate;
	67	+ /**
	68	+ * 2018年3月21日要求进行分离
	69	+ * 乙肝疫苗注射者
	70	+ */
	71	+ private String hbvInjectUserName;
	72	+
	73	+ /**
	74	+ * 2018年3月21日要求进行分离
	75	+ * 卡介苗接种注射者
	76	+ */
	77	+ private String bCGInjectUserName;
	78	+
	79	+ /**
59	80	* @auther HuJiaqi
60	81	* @createTime 2016年12月05日 18时14分
61	82	* @discription 卡介苗和乙肝疫苗接种日期
...	...	@@ -147,6 +168,38 @@
147	168	private Date createDate;
148	169
149	170	private Integer yn;
	171	+
	172	+ public Date getbCGVaccinDate() {
	173	+ return bCGVaccinDate;
	174	+ }
	175	+
	176	+ public void setbCGVaccinDate(Date bCGVaccinDate) {
	177	+ this.bCGVaccinDate = bCGVaccinDate;
	178	+ }
	179	+
	180	+ public Date getHbvVaccinDate() {
	181	+ return hbvVaccinDate;
	182	+ }
	183	+
	184	+ public void setHbvVaccinDate(Date hbvVaccinDate) {
	185	+ this.hbvVaccinDate = hbvVaccinDate;
	186	+ }
	187	+
	188	+ public String getHbvInjectUserName() {
	189	+ return hbvInjectUserName;
	190	+ }
	191	+
	192	+ public void setHbvInjectUserName(String hbvInjectUserName) {
	193	+ this.hbvInjectUserName = hbvInjectUserName;
	194	+ }
	195	+
	196	+ public String getbCGInjectUserName() {
	197	+ return bCGInjectUserName;
	198	+ }
	199	+
	200	+ public void setbCGInjectUserName(String bCGInjectUserName) {
	201	+ this.bCGInjectUserName = bCGInjectUserName;
	202	+ }
150	203
151	204	public Integer getYn() {
152	205	return yn;

...	...	@@ -132,6 +132,13 @@
132	132	BeanUtils.copy(baby, dischargeAbstractBabyModel);
133	133	dischargeAbstractBabyModel.setMotherId(dischargeAbstractMotherModel.getId());
134	134	dischargeAbstractBabyModel.setCreateDate(new Date());
	135	+ //新增字段
	136	+ dischargeAbstractBabyModel.setbCGVaccinDate(DateUtil.parseYMD(baby.getbCGVaccinDate()));
	137	+ dischargeAbstractBabyModel.setHbvVaccinDate(DateUtil.parseYMD(baby.getHbvVaccinDate()));
	138	+ dischargeAbstractBabyModel.setHbvInjectUserName(baby.getHbvInjectUserName());
	139	+ dischargeAbstractBabyModel.setbCGInjectUserName(baby.getbCGInjectUserName());
	140	+
	141	+
135	142	dischargeAbstractBabyModel.setbCGAndHBVVaccinationDate(DateUtil.parseYMD(baby.getbCGAndHBVVaccinationDate()));
136	143	dischargeAbstractBabyModel.sethBIGInjectDate(DateUtil.parseYMD(baby.gethBIGInjectDate()));
137	144	dischargeAbstractBabyModel.setpId(baby.getpId());

...	...	@@ -2842,6 +2842,21 @@
2842	2842	}
2843	2843
2844	2844	Map<String, Object> babyMap = new HashMap<>();
	2845	+
	2846	+ //新增字段
	2847	+ if(temp.getbCGVaccinDate()!=null\|\|temp.getHbvVaccinDate()!=null\|\|
	2848	+ StringUtils.isNotEmpty(temp.getHbvInjectUserName())\|\|StringUtils.isNotEmpty(temp.getbCGInjectUserName())){//如果修改过数据
	2849	+ babyMap.put("bCGVaccinDate", temp.getbCGVaccinDate());
	2850	+ babyMap.put("hbvVaccinDate", temp.getHbvVaccinDate());
	2851	+ babyMap.put("hbvInjectUserName", temp.getHbvInjectUserName());
	2852	+ babyMap.put("bCGInjectUserName", temp.getbCGInjectUserName());
	2853	+ }else{
	2854	+ babyMap.put("bCGVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGAndHBVVaccinationDate()));
	2855	+ babyMap.put("hbvVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGAndHBVVaccinationDate()));
	2856	+ babyMap.put("hbvInjectUserName", temp.getbCGAndHBVVaccinationInjectUserName());
	2857	+ babyMap.put("bCGInjectUserName", temp.getbCGAndHBVVaccinationInjectUserName());
	2858	+ }
	2859	+
2845	2860	babyMap.put("description", temp.getDescription());
2846	2861	babyMap.put("birthCertificateId", temp.getBirthCertificateId());
2847	2862	babyMap.put("isBCG", FunvCommonUtil.checkIsInoculation(temp.getIsBCG()));

...	...	@@ -117,6 +117,17 @@
117	117	private Integer isHBV;
118	118
119	119	/**
	120	+ * 2018年3月21日要求进行分离
	121	+ * 卡介苗接种日期
	122	+ */
	123	+ private String bCGVaccinDate;
	124	+ /**
	125	+ * 2018年3月21日要求进行分离
	126	+ * 乙肝疫苗接种日期
	127	+ */
	128	+ private String hbvVaccinDate;
	129	+
	130	+ /**
120	131	* @auther HuJiaqi
121	132	* @createTime 2016年12月05日 18时14分
122	133	* @discription 卡介苗和乙肝疫苗接种日期
...	...	@@ -138,6 +149,18 @@
138	149	private String bCGAndHBVVaccinationInjectUserName;
139	150
140	151	/**
	152	+ * 2018年3月21日要求进行分离
	153	+ * 乙肝疫苗注射者
	154	+ */
	155	+ private String hbvInjectUserName;
	156	+
	157	+ /**
	158	+ * 2018年3月21日要求进行分离
	159	+ * 卡介苗接种注射者
	160	+ */
	161	+ private String bCGInjectUserName;
	162	+
	163	+ /**
141	164	* @auther HuJiaqi
142	165	* @createTime 2016年12月05日 18时19分
143	166	* @discription 是否注射乙肝免疫球蛋白
...	...	@@ -201,6 +224,37 @@
201	224	private String orderScreenDescription;
202	225
203	226
	227	+ public String getbCGVaccinDate() {
	228	+ return bCGVaccinDate;
	229	+ }
	230	+
	231	+ public void setbCGVaccinDate(String bCGVaccinDate) {
	232	+ this.bCGVaccinDate = bCGVaccinDate;
	233	+ }
	234	+
	235	+ public String getHbvVaccinDate() {
	236	+ return hbvVaccinDate;
	237	+ }
	238	+
	239	+ public void setHbvVaccinDate(String hbvVaccinDate) {
	240	+ this.hbvVaccinDate = hbvVaccinDate;
	241	+ }
	242	+
	243	+ public String getHbvInjectUserName() {
	244	+ return hbvInjectUserName;
	245	+ }
	246	+
	247	+ public void setHbvInjectUserName(String hbvInjectUserName) {
	248	+ this.hbvInjectUserName = hbvInjectUserName;
	249	+ }
	250	+
	251	+ public String getbCGInjectUserName() {
	252	+ return bCGInjectUserName;
	253	+ }
	254	+
	255	+ public void setbCGInjectUserName(String bCGInjectUserName) {
	256	+ this.bCGInjectUserName = bCGInjectUserName;
	257	+ }
204	258
205	259	public String getpId() {
206	260	return pId;

...	...	@@ -86,10 +86,10 @@
86	86	query.setEndBuildDay(buildEnd);
87	87	//妇女建档主数据
88	88	List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
89		- restList = getResidentMainData(modelList);
90	89	// StopWatch stopWatch = new StopWatch("妇女建档主数据");
91	90	//优化前
92	91	// stopWatch.start("妇女建档优化前");
	92	+ restList = getResidentMainData(modelList);
93	93	// stopWatch.stop();
94	94	//优化后
95	95	// stopWatch.start("妇女建档优化后");