jiangjiazhi / regional-platform

Commit 8e4bae296da612b52e1a7e3e8f07bd6643da25cb

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

产前诊断

Showing 6 changed files with 208 additions and 9 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DiagnosisService.java
platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnosisResult.java

...	...	@@ -35,8 +35,8 @@
35	35	}
36	36
37	37	public DiagnosisModel addDiagnosis(DiagnosisModel data){
38		- data.setCreated(new Date());
39		- data.setModified(new Date());
	38	+ /*data.setCreated(new Date());
	39	+ data.setModified(new Date());*/
40	40	return diagnosisDao.addDiagnosis(data);
41	41	}
42	42

1	1	package com.lyms.platform.pojo;
2	2
3	3	import com.lyms.platform.common.result.BaseModel;
	4	+import com.lyms.platform.common.utils.DateUtil;
4	5	import org.springframework.data.mongodb.core.mapping.Document;
5	6
6	7	import java.util.Date;
	8	+import java.util.HashMap;
	9	+import java.util.Map;
7	10
8	11	/**
9	12	* 产前诊断申请（新增）
10	13
...	...	@@ -19,9 +22,13 @@
19	22	private String cardNo;//身份证号
20	23	private String age;//年龄
21	24	private String dueWeek;//孕周
	25	+ private String applyWeek;//申请孕周
	26	+ private String nowWeek;//当前孕周
	27	+ private String rsResult;//妊娠结局
22	28	private Date yChanQi;//预产期
23	29	private String phone;//联系方式
24	30	private String diaProject;//诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测)
	31	+ private String diaResult;//诊断结果(0，阴性；1，阳性)
25	32	private Date birth;//出生日期
26	33	private String weight;//体重
27	34	private Date lastMenses;//末次月经
...	...	@@ -35,7 +42,8 @@
35	42	private String sendDocterId;//送检医生
36	43	private Date sendDate;//送检日期
37	44	private String collectHospitalId;//申请医院
38		- private Date created;//创建时间
	45	+ private Date created;//创建时间(申请时间)
	46	+ private Date resultDate;//诊断出具时间
39	47	private Date modified;//修改时间
40	48	private String status;//数据来源(1,申请过来的；2，自动流转过来)
41	49	private String diaStatus;//数据状态（0，未申请；1，已申请；2，已接收；3，已诊断）
42	50
...	...	@@ -72,11 +80,11 @@
72	80	this.name = name;
73	81	}
74	82
75		- public String getIdCard() {
	83	+ public String getCardNo() {
76	84	return cardNo;
77	85	}
78	86
79		- public void setIdCard(String cardNo) {
	87	+ public void setCardNo(String cardNo) {
80	88	this.cardNo = cardNo;
81	89	}
82	90
...	...	@@ -254,6 +262,83 @@
254	262
255	263	public void setDiaStatus(String diaStatus) {
256	264	this.diaStatus = diaStatus;
	265	+ }
	266	+
	267	+ public String getNowWeek() {
	268	+ return nowWeek;
	269	+ }
	270	+
	271	+ public void setNowWeek(String nowWeek) {
	272	+ this.nowWeek = nowWeek;
	273	+ }
	274	+
	275	+ public String getRsResult() {
	276	+ return rsResult;
	277	+ }
	278	+
	279	+ public void setRsResult(String rsResult) {
	280	+ this.rsResult = rsResult;
	281	+ }
	282	+
	283	+ public String getDiaResult() {
	284	+ return diaResult;
	285	+ }
	286	+
	287	+ public void setDiaResult(String diaResult) {
	288	+ this.diaResult = diaResult;
	289	+ }
	290	+
	291	+ public Date getResultDate() {
	292	+ return resultDate;
	293	+ }
	294	+
	295	+ public void setResultDate(Date resultDate) {
	296	+ this.resultDate = resultDate;
	297	+ }
	298	+
	299	+ public String getApplyWeek() {
	300	+ return applyWeek;
	301	+ }
	302	+
	303	+ public void setApplyWeek(String applyWeek) {
	304	+ this.applyWeek = applyWeek;
	305	+ }
	306	+
	307	+ public Map<String,String> contomap(){
	308	+ Map<String,String> map = new HashMap<String,String>();
	309	+ map.put("id",id);
	310	+ map.put("hospitalId",hospitalId);
	311	+ map.put("parentId",parentId);
	312	+ map.put("name",name);
	313	+ map.put("cardNo",cardNo);
	314	+ map.put("age",age);
	315	+ map.put("dueWeek",dueWeek);
	316	+ map.put("yChanQi", DateUtil.getyyyy_MM_dd(yChanQi));
	317	+ map.put("phone",phone);
	318	+ map.put("diaProject",diaProject);
	319	+ map.put("birth",DateUtil.getyyyy_MM_dd(birth));
	320	+ map.put("weight",weight);
	321	+ map.put("lastMenses",DateUtil.getyyyy_MM_dd(lastMenses));
	322	+ map.put("mensStartDay",mensStartDay);
	323	+ map.put("mensEndDay",mensEndDay);
	324	+ map.put("mensStopStartDay",mensStopStartDay);
	325	+ map.put("mensStopEndDay",mensStopEndDay);
	326	+ map.put("specimenNo",specimenNo);
	327	+ map.put("collectDocterId",collectDocterId);
	328	+ map.put("collectDate",DateUtil.getyyyy_MM_dd(collectDate));
	329	+ map.put("sendDocterId",sendDocterId);
	330	+ map.put("sendDate",DateUtil.getyyyy_MM_dd(sendDate));
	331	+ map.put("collectHospitalId",collectHospitalId);
	332	+ map.put("created",DateUtil.getyyyy_MM_dd(created));
	333	+ map.put("modified",DateUtil.getyyyy_MM_dd(modified));
	334	+ map.put("status",status);
	335	+ map.put("diaStatus",diaStatus);
	336	+ map.put("nowWeek",nowWeek);
	337	+ map.put("rsResult",rsResult);
	338	+ map.put("diaResult",diaResult);
	339	+ map.put("applyWeek",applyWeek);
	340	+ map.put("resultDate",DateUtil.getyyyy_MM_dd(resultDate));
	341	+ return map;
257	342	}
258	343	}

...	...	@@ -16,8 +16,14 @@
16	16	private String parentId;//孕妇建档ID
17	17	private String queryNos;//查询号
18	18	private String diaStatus;//数据状态
	19	+ private String queryNo;//查询号
	20	+ private String order;//排序字段
	21	+ private String hospitalId;//医院ID
	22	+ private String cardNo;//身份证
	23	+ private String vcCardNo;//就诊卡号
19	24
20	25
	26	+
21	27	public String getId() {
22	28	return id;
23	29	}
...	...	@@ -48,6 +54,46 @@
48	54
49	55	public void setDiaStatus(String diaStatus) {
50	56	this.diaStatus = diaStatus;
	57	+ }
	58	+
	59	+ public String getQueryNo() {
	60	+ return queryNo;
	61	+ }
	62	+
	63	+ public void setQueryNo(String queryNo) {
	64	+ this.queryNo = queryNo;
	65	+ }
	66	+
	67	+ public String getOrder() {
	68	+ return order;
	69	+ }
	70	+
	71	+ public void setOrder(String order) {
	72	+ this.order = order;
	73	+ }
	74	+
	75	+ public String getHospitalId() {
	76	+ return hospitalId;
	77	+ }
	78	+
	79	+ public void setHospitalId(String hospitalId) {
	80	+ this.hospitalId = hospitalId;
	81	+ }
	82	+
	83	+ public String getCardNo() {
	84	+ return cardNo;
	85	+ }
	86	+
	87	+ public void setCardNo(String cardNo) {
	88	+ this.cardNo = cardNo;
	89	+ }
	90	+
	91	+ public String getVcCardNo() {
	92	+ return vcCardNo;
	93	+ }
	94	+
	95	+ public void setVcCardNo(String vccardNo) {
	96	+ this.vcCardNo = vccardNo;
51	97	}
52	98
53	99	public MongoQuery convertToQuery() {

...	...	@@ -67,6 +67,8 @@
67	67	patientsQuery.setPhoneOrCert(cardNo);
68	68	} else if (StringUtils.isNotEmpty(vcCardNo)) {
69	69	patientsQuery.setVcCardNo(vcCardNo);
	70	+ } else{
	71	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件");
70	72	}
71	73	List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
72	74	Patients pat = null;
...	...	@@ -147,6 +149,17 @@
147	149	AntExChuModel chuModel = aList.get(0);
148	150	diagnosisResult.setWeight(chuModel.getYqWeight());
149	151	}
	152	+
	153	+ DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
	154	+ diagnosisQuery.setCardNo(cardNo);
	155	+ diagnosisQuery.setVcCardNo(vcCardNo);
	156	+ diagnosisQuery.setDiaStatus("0");
	157	+ diagnosisQuery.setHospitalId(hospitalId);
	158	+ List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery);
	159	+ if(diaList != null && diaList.size() > 0){
	160	+ diagnosisResult.setId(diaList.get(0).getId());
	161	+ }
	162	+
150	163	}
151	164	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(diagnosisResult);
152	165	}
...	...	@@ -161,6 +174,8 @@
161	174	public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){
162	175	DiagnosisModel DiagnosisModel = dataresult.convertToDataModel();
163	176	DiagnosisModel.setDiaStatus("1");
	177	+ DiagnosisModel.setCreated(new Date());
	178	+ DiagnosisModel.setModified(new Date());
164	179	String hospital = autoMatchFacade.getHospitalId(userId);
165	180	if(StringUtils.isNotEmpty(DiagnosisModel.getId())){//更新数据
166	181	DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
...	...	@@ -176,7 +191,7 @@
176	191	objectResponse.setErrormsg("成功");
177	192	return objectResponse;
178	193	}else{//新增数据
179		- DiagnosisModel.setDiaStatus("1");//已申请
	194	+ DiagnosisModel.setStatus("1");
180	195	diagnosisService.addDiagnosis(DiagnosisModel);//插入数据
181	196	BaseObjectResponse objectResponse = new BaseObjectResponse();
182	197	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
183	198
184	199
185	200
...	...	@@ -188,11 +203,55 @@
188	203	}
189	204
190	205
	206	+ /**
	207	+ * 根据ID查询产前诊断信息
	208	+ * @param id
	209	+ * @param userId
	210	+ * @return
	211	+ */
	212	+ public BaseResponse queryOneDiaById(String id,Integer userId){
	213	+ BaseObjectResponse br = new BaseObjectResponse();
	214	+ String hospital = autoMatchFacade.getHospitalId(userId);
	215	+ DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
	216	+ diagnosisQuery.setId(id);
	217	+ DiagnosisModel dia = new DiagnosisModel();
	218	+ dia = diagnosisService.findOneDiagnosisById(id);
	219	+ br.setData(dia.contomap());
	220	+ br.setErrorcode(ErrorCodeConstants.SUCCESS);
	221	+ br.setErrormsg("成功");
	222	+ return br;
	223	+ }
191	224
	225	+
	226	+ /**
	227	+ * 产前诊断申请管理
	228	+ * @param dataresult
	229	+ * @return
	230	+ */
192	231	public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult){
	232	+ DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
	233	+ DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
193	234
194	235
195		- return null;
	236	+ diagnosisQuery.setPage(dataresult.getPage());
	237	+ diagnosisQuery.setLimit(dataresult.getLimit());
	238	+ diagnosisQuery.setNeed("need");
	239	+ diagnosisQuery.setOrder("created");
	240	+ //babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(babySieveAddRequest.getOperatorId()));
	241	+ diagnosisQuery.setHospitalId("216");
	242	+ List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery);
	243	+ if(CollectionUtils.isEmpty(diaList)){
	244	+ diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());
	245	+ diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
	246	+ diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
	247	+ return diagnosisManagerResult;
	248	+ }
	249	+
	250	+ diagnosisManagerResult.setData(diaList);
	251	+ diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());
	252	+ diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
	253	+ diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
	254	+ return diagnosisManagerResult;
196	255	}
197	256
198	257	}

...	...	@@ -32,7 +32,7 @@
32	32	private String phone;
33	33	//年龄
34	34	private String age;
35		- //孕周
	35	+ //申请孕周
36	36	private String dueWeek;
37	37	//预产期
38	38	private String yChanQi;
39	39
...	...	@@ -66,7 +66,15 @@
66	66	private String collectHospitalId;
67	67	//医院ID
68	68	private String hospitalId;
	69	+ //查询号
	70	+ private String queryNo;
	71	+ //诊断结果
	72	+ private String diaResult;
	73	+ //申请孕周
	74	+ private String applyWeek;
69	75
	76	+
	77	+
70	78	public String getNeed() {
71	79	return need;
72	80	}
...	...	@@ -290,7 +298,7 @@
290	298	diagnosisModel.setHospitalId(hospitalId);
291	299	diagnosisModel.setParentId(parentId);
292	300	diagnosisModel.setName(name);
293		- diagnosisModel.setIdCard(cardNo);
	301	+ diagnosisModel.setCardNo(cardNo);
294	302	diagnosisModel.setAge(age);
295	303	diagnosisModel.setDueWeek(dueWeek);
296	304	diagnosisModel.setyChanQi(DateUtil.parseYMD(yChanQi));

...	...	@@ -230,6 +230,7 @@
230	230	}
231	231
232	232	public DiagnosisResult convertToResult(Patients patient){
	233	+ setParentId(patient.getId());
233	234	setName(patient.getUsername());
234	235	try{
235	236	if (null != patient.getBirth()) {