jiangjiazhi / regional-platform

Commit f0e052f54c91041d94f9870a1af1e94c751b80f2

Authored by gengxiaokai about 7 years ago

Exists in master and in 6 other branches

新筛修改

Showing 5 changed files with 53 additions and 14 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java

...	...	@@ -309,14 +309,14 @@
309	309	map.put("collectHospitalId",collectHospitalId);
310	310	map.put("currentHospitalId",currentHospitalId);
311	311	map.put("collectDocterId",collectDocterId);
312		- map.put("collectDate", DateUtil.getYMDH(collectDate));
	312	+ map.put("collectDate", DateUtil.getYMDH(collectDate)+":00");
313	313	map.put("montherName",montherName);
314	314	map.put("zyNo",zyNo);
315	315	map.put("montherCardNo",montherCardNo);
316	316	map.put("montherDisease",montherDisease);
317	317	map.put("phone",phone);
318	318	map.put("address",address);
319		- map.put("babyBirth",DateUtil.getYMDH(babyBirth));
	319	+ map.put("babyBirth",DateUtil.getYMDH(babyBirth)+":00");
320	320	map.put("babyName",babyName);
321	321	map.put("dueWeek",dueWeek);
322	322	map.put("dueType",dueType);

...	...	@@ -38,9 +38,9 @@
38	38	@ResponseBody
39	39	@RequestMapping(value = "/queryBabySieve",method = RequestMethod.GET)
40	40	public BaseResponse querySieve(@RequestParam(required = false)String cardNo,@RequestParam(required = false)String vcCardNo,HttpServletRequest request) {
41		- //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
42		- return babySieveFacede.queryBabySieve(cardNo, vcCardNo, 1000000185);
43		- //return babySieveFacede.queryBabySieve(cardNo, vcCardNo, loginState.getId());
	41	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	42	+ //return babySieveFacede.queryBabySieve(cardNo, vcCardNo, 1000000185);
	43	+ return babySieveFacede.queryBabySieve(cardNo, vcCardNo, loginState.getId());
44	44	}
45	45
46	46
...	...	@@ -53,7 +53,7 @@
53	53	@ResponseBody
54	54	@RequestMapping(value = "/AddbabySieve",method = RequestMethod.POST)
55	55	public BaseResponse addOneSieve(@RequestBody @Valid BabySieveAddRequest babySieveAddRequest,HttpServletRequest request) {
56		- //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	56	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
57	57	//babySieveAddRequest.setId("5b8e296a80edc4ed6f7baa2e");
58	58	/* babySieveAddRequest.setTestNumber("试验号");
59	59	babySieveAddRequest.setCollectHospitalId("216");
...	...	@@ -74,7 +74,7 @@
74	74	babySieveAddRequest.setMatdeliverId("5a4f36f80cf28c02bff7a84f");
75	75	babySieveAddRequest.setPatientId("590974c50cf2c06b1d653f5d");
76	76	babySieveAddRequest.setCreated("2018-09-04 15:00:15");*/
77		- return babySieveFacede.addOrUpdateBabySieve(babySieveAddRequest, 1000000185);
	77	+ return babySieveFacede.addOrUpdateBabySieve(babySieveAddRequest, loginState.getId());
78	78	}
79	79
80	80
...	...	@@ -115,8 +115,8 @@
115	115	if(StringUtils.isNotEmpty(id)){
116	116	String[] ary = id.split(",");
117	117	for(String item : ary){
118		- //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
119		- bList.add(babySieveFacede.updateSieveStarts(item,1000000185));
	118	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	119	+ bList.add(babySieveFacede.updateSieveStarts(item,loginState.getId()));
120	120	}
121	121	return bList;
122	122	}
...	...	@@ -135,8 +135,8 @@
135	135	@ResponseBody
136	136	@RequestMapping(value = "/babySieveLab",method = RequestMethod.GET)
137	137	public BaseResponse babySieveLab(BabySieveAddRequest babySieveAddRequest,HttpServletRequest request) {
138		- //babySieveAddRequest.setOperatorId(((LoginContext) request.getAttribute("loginContext")).getId());
139		- babySieveAddRequest.setOperatorId(1000000185);
	138	+ babySieveAddRequest.setOperatorId(((LoginContext) request.getAttribute("loginContext")).getId());
	139	+ //babySieveAddRequest.setOperatorId(1000000185);
140	140	return babySieveFacede.getBabySieveLab(babySieveAddRequest);
141	141	}
142	142

...	...	@@ -17,6 +17,7 @@
17	17	import com.lyms.platform.operate.web.request.BabyScreenAddRequest;
18	18	import com.lyms.platform.operate.web.request.BabySieveAddRequest;
19	19	import com.lyms.platform.operate.web.result.*;
	20	+import com.lyms.platform.operate.web.utils.CommonsHelper;
20	21	import com.lyms.platform.permission.model.Organization;
21	22	import com.lyms.platform.permission.service.OrganizationService;
22	23	import com.lyms.platform.pojo.BabyModel;
...	...	@@ -49,6 +50,8 @@
49	50	public class BabySieveFacede {
50	51
51	52	@Autowired
	53	+ private BasicConfigService basicConfigService;
	54	+ @Autowired
52	55	private AutoMatchFacade autoMatchFacade;
53	56	@Autowired
54	57	private PatientsService patientsService;
55	58
...	...	@@ -107,7 +110,14 @@
107	110	babySieveResult.setCurrentHospitalName(og.getName());
108	111	babySieveResult.setRiskFactor(highScoreResult.getHighRisk());
109	112	babySieveResult.setRiskScore(highScoreResult.getScoreStr());
	113	+ //母亲居住地址
	114	+ String jzSheng = CommonsHelper.getName1(pat.getProvinceRegisterId(), basicConfigService);
	115	+ String jzShi = CommonsHelper.getName1(pat.getCityRegisterId(), basicConfigService);
	116	+ String jzXian = CommonsHelper.getName1(pat.getAreaRegisterId(), basicConfigService);
	117	+ String jzXiang = CommonsHelper.getName1(pat.getStreetRegisterId(), basicConfigService);
	118	+ String jQquan = jzSheng+jzShi+jzXian+jzXiang;
110	119	babySieveResult.convert(pat);
	120	+ babySieveResult.setAdress(jQquan);
111	121	List<BabySieveData> list = new ArrayList<BabySieveData>();
112	122	for(BabyModel babyModel : models){
113	123	if(null == babyModel.getSieveStatus()){//sieveStatus值为空时新生儿为未申请筛查的状态
114	124
...	...	@@ -120,11 +130,12 @@
120	130	if(mList != null && mList.size() > 0){
121	131	maternalDeliverModel = mList.get(0);
122	132	}
	133	+ babySieveResult.setDueWeek(maternalDeliverModel.getDueWeek());
123	134	List<MaternalDeliverModel.Baby> babies = maternalDeliverModel.getBaby();
124	135	for(MaternalDeliverModel.Baby baby : babies){
125	136	if(baby.getId() != null && babyModel.getId().equals(baby.getId())){
126	137	Date d = DateUtil.parseYMDHM(baby.getDueTime());
127		- data.setDueDate(DateUtil.getYMDH(d));
	138	+ data.setDueDate(DateUtil.getYMDH(d)+":00");
128	139	break;
129	140	}
130	141	}
...	...	@@ -319,6 +330,13 @@
319	330	if(null != patients.getDueDate()){
320	331	babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
321	332	}
	333	+ //母亲居住地址
	334	+ String jzSheng = CommonsHelper.getName1(patients.getProvinceRegisterId(), basicConfigService);
	335	+ String jzShi = CommonsHelper.getName1(patients.getCityRegisterId(), basicConfigService);
	336	+ String jzXian = CommonsHelper.getName1(patients.getAreaRegisterId(), basicConfigService);
	337	+ String jzXiang = CommonsHelper.getName1(patients.getStreetRegisterId(), basicConfigService);
	338	+ String jQquan = jzSheng+jzShi+jzXian+jzXiang;
	339	+ babySieveManager.setAdress(jQquan);
322	340	babySieveManager.setPatientId(patients.getId());
323	341	babySieveManager.setCardNo(patients.getCardNo());
324	342	babySieveManager.setPhone(patients.getPhone());

...	...	@@ -29,6 +29,9 @@
29	29	//母亲手机号
30	30	private String phone;
31	31
	32	+ //母亲居住地址
	33	+ private String adress;
	34	+
32	35	//分娩日期
33	36	private String birthYMD;
34	37
...	...	@@ -135,6 +138,14 @@
135	138
136	139	public void setPhone(String phone) {
137	140	this.phone = phone;
	141	+ }
	142	+
	143	+ public String getAdress() {
	144	+ return adress;
	145	+ }
	146	+
	147	+ public void setAdress(String adress) {
	148	+ this.adress = adress;
138	149	}
139	150
140	151	public List getRiskFactor() {

...	...	@@ -51,6 +51,8 @@
51	51	private String currentHospitalId;
52	52	//当前登陆操作医院名称
53	53	private String currentHospitalName;
	54	+ //孕妇居住地址
	55	+ private String adress;
54	56
55	57	/*新生儿信息*/
56	58	private List<BabySieveData> data;
...	...	@@ -208,6 +210,14 @@
208	210	this.lastMenses = lastMenses;
209	211	}
210	212
	213	+ public String getAdress() {
	214	+ return adress;
	215	+ }
	216	+
	217	+ public void setAdress(String adress) {
	218	+ this.adress = adress;
	219	+ }
	220	+
211	221	public BabySieveResult convert(Patients pat){
212	222	setId(pat.getId());
213	223	try {
...	...	@@ -225,8 +235,8 @@
225	235	setRemarks(pat.getMremark());
226	236	setBirth(DateUtil.getyyyy_MM_dd(pat.getBirth()));
227	237	if (null != pat.getLastMenses()) {
228		- int days = DateUtil.daysBetween(pat.getLastMenses(), new Date());
229		- this.dueWeek = StringUtils.dueWeek(days);
	238	+ /*int days = DateUtil.daysBetween(pat.getLastMenses(), new Date());
	239	+ this.dueWeek = StringUtils.dueWeek(days);*/
230	240
231	241	setLastMenses(DateUtil.getyyyy_MM_dd(pat.getLastMenses()));
232	242	}