jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6a8e1c067ef3844336f22d5cc13175120b49e347

Authored by gengxiaokai
1 parent abceccf373
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

产前诊断

Showing 3 changed files with 59 additions and 26 deletions

platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java View file @ 6a8e1c0
... ... @@ -222,6 +222,9 @@
222 222 if(null != id){
223 223 condition = condition.and("id", id, MongoOper.IS);
224 224 }
  225 + if(null != parentId){
  226 + condition = condition.and("parentId", parentId, MongoOper.IS);
  227 + }
225 228 if(null != diaStatus){
226 229 condition = condition.and("diaStatus", diaStatus, MongoOper.IS);
227 230 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java View file @ 6a8e1c0
... ... @@ -45,25 +45,26 @@
45 45 * @return
46 46 */
47 47 @ResponseBody
48   - @RequestMapping(value = "/addDiagnosis",method = RequestMethod.POST)
  48 + @RequestMapping(value = "/addDiagnosis",method = RequestMethod.GET)
49 49 public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest diagnosisAddRequest,HttpServletRequest request){
50 50 //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
51   - /*diagnosisAddRequest.setName("李欣");
52   - diagnosisAddRequest.setId("5bad9c8193131f38be325f04");
53   - diagnosisAddRequest.setCardNo("210224199007216341");
54   - diagnosisAddRequest.setPhone("15533641942");
55   - diagnosisAddRequest.setAge("28");
56   - diagnosisAddRequest.setDueWeek("孕14周+2天");
57   - diagnosisAddRequest.setyChanQi("2019-03-08");
  51 + /*diagnosisAddRequest.setName("aaaa");
  52 + diagnosisAddRequest.setId("5bade15d0cf2d495ecedb46f");
  53 + diagnosisAddRequest.setParentId("5b0d033f0cf2424cd354b770");
  54 + diagnosisAddRequest.setCardNo("152723198803201302");
  55 + diagnosisAddRequest.setPhone("13548143526");
  56 + diagnosisAddRequest.setAge("30");
  57 + diagnosisAddRequest.setDueWeek("孕19周+1天");
  58 + diagnosisAddRequest.setyChanQi("2019-02-21");
58 59 diagnosisAddRequest.setDiaProject("1");//羊水穿刺
59   - diagnosisAddRequest.setBirth("1990-07-21");
60   - diagnosisAddRequest.setWeight("60");
61   - diagnosisAddRequest.setLastMenses("2018-06-01");
  60 + diagnosisAddRequest.setBirth("1988-03-20");
  61 + diagnosisAddRequest.setWeight("62");
  62 + diagnosisAddRequest.setLastMenses("2018-05-17");
62 63 diagnosisAddRequest.setMensStartDay("28");
63 64 diagnosisAddRequest.setMensEndDay("30");
64 65 diagnosisAddRequest.setMensStopStartDay("5");
65 66 diagnosisAddRequest.setMensStopEndDay("7");
66   - diagnosisAddRequest.setSpecimenNo("00001");
  67 + diagnosisAddRequest.setSpecimenNo("00006");
67 68 diagnosisAddRequest.setCollectDocterId("1000000185");
68 69 diagnosisAddRequest.setCollectDate("2018-09-28");
69 70 diagnosisAddRequest.setSendDocterId("1000000185");
... ... @@ -99,6 +100,21 @@
99 100 //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
100 101 dataresult.setHospitalId("1000000185");
101 102 return diagnosisFacaed.queryDiagnosisList(dataresult);
  103 + }
  104 +
  105 +
  106 + /**
  107 + * 产前诊断管理
  108 + * @param dataresult
  109 + * @param request
  110 + * @return
  111 + */
  112 + @ResponseBody
  113 + @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET)
  114 + public DiagnosisManagerResult getDiagnosisLab(DiagnosisAddRequest dataresult,HttpServletRequest request){
  115 + //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  116 + dataresult.setHospitalId("1000000185");
  117 + return diagnosisFacaed.queryDiagnosisLab(dataresult);
102 118 }
103 119  
104 120 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java View file @ 6a8e1c0
... ... @@ -23,6 +23,7 @@
23 23 import java.util.ArrayList;
24 24 import java.util.Date;
25 25 import java.util.List;
  26 +import java.util.Map;
26 27  
27 28 /**
28 29 * Created by Administrator on 2018/9/11.
... ... @@ -74,6 +75,12 @@
74 75 Patients pat = null;
75 76 if (CollectionUtils.isNotEmpty(localPatients)) {
76 77 pat = localPatients.get(0);
  78 + DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
  79 + diagnosisQuery.setParentId(pat.getId());
  80 + List<DiagnosisModel> dia = diagnosisService.queryDiagnosis(diagnosisQuery);
  81 + if(dia != null && dia.size() > 0){
  82 + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("已经申请产前诊断，不能重复申请！");
  83 + }
77 84 } else {
78 85 patientsQuery.setHospitalId(null);
79 86 List<Patients> areaPatients = patientsService.queryPatient(patientsQuery);
80 87  
81 88  
82 89  
83 90  
84 91  
85 92  
86 93  
... ... @@ -172,30 +179,30 @@
172 179 * @return
173 180 */
174 181 public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){
175   - DiagnosisModel DiagnosisModel = dataresult.convertToDataModel();
176   - DiagnosisModel.setDiaStatus("1");
177   - DiagnosisModel.setCreated(new Date());
178   - DiagnosisModel.setModified(new Date());
  182 + DiagnosisModel diagnosisModel = dataresult.convertToDataModel();
  183 + diagnosisModel.setDiaStatus("1");
  184 + diagnosisModel.setCreated(new Date());
  185 + diagnosisModel.setModified(new Date());
179 186 String hospital = autoMatchFacade.getHospitalId(userId);
180   - if(StringUtils.isNotEmpty(DiagnosisModel.getId())){//更新数据
  187 + if(StringUtils.isNotEmpty(diagnosisModel.getId())){//更新数据
181 188 DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
182   - diagnosisQuery.setParentId(DiagnosisModel.getId());
  189 + diagnosisQuery.setId(diagnosisModel.getId());
183 190 List<DiagnosisModel> list = diagnosisService.queryDiagnosis(diagnosisQuery);
184 191 //更新数据
185   - diagnosisService.updateDiagnosisById(DiagnosisModel,DiagnosisModel.getId());
  192 + diagnosisService.updateDiagnosisById(diagnosisModel,diagnosisModel.getId());
186 193 //添加记录
187   - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0), DiagnosisModel, OptActionEnums.UPDATE.getId(), "产前诊断申请修改完成");
  194 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0), diagnosisModel, OptActionEnums.UPDATE.getId(), "产前诊断申请修改完成");
188 195 BaseObjectResponse objectResponse = new BaseObjectResponse();
189 196 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
190   - objectResponse.setData(DiagnosisModel.getId());
  197 + objectResponse.setData(diagnosisModel.getId());
191 198 objectResponse.setErrormsg("成功");
192 199 return objectResponse;
193 200 }else{//新增数据
194   - DiagnosisModel.setStatus("1");
195   - diagnosisService.addDiagnosis(DiagnosisModel);//插入数据
  201 + diagnosisModel.setStatus("1");
  202 + diagnosisService.addDiagnosis(diagnosisModel);//插入数据
196 203 BaseObjectResponse objectResponse = new BaseObjectResponse();
197 204 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
198   - objectResponse.setData(DiagnosisModel.getId());
  205 + objectResponse.setData(diagnosisModel.getId());
199 206 objectResponse.setErrormsg("成功");
200 207 return objectResponse;
201 208 }
... ... @@ -230,6 +237,7 @@
230 237 public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult){
231 238 DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
232 239 DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
  240 + List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
233 241 if(null != dataresult.getDiaResult()){
234 242 diagnosisQuery.setDiaResult(dataresult.getDiaResult());
235 243 }
236 244  
... ... @@ -283,10 +291,11 @@
283 291 return diagnosisManagerResult;
284 292 }
285 293 for(DiagnosisModel diagnosisModel : diaList){
286   - SieveQuery sieveQuery = new SieveQuery();
  294 + mList.add(diagnosisModel.contomap());
287 295 if(StringUtils.isEmpty(diagnosisModel.getParentId())){
288 296 continue;
289 297 }
  298 + SieveQuery sieveQuery = new SieveQuery();
290 299 sieveQuery.setParentId(diagnosisModel.getParentId());
291 300 //查询产筛list
292 301 List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
... ... @@ -309,7 +318,7 @@
309 318 }
310 319 }
311 320 }
312   - diagnosisManagerResult.setData(diaList);
  321 + diagnosisManagerResult.setData(mList);
313 322 diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());
314 323 diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
315 324 diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
... ... @@ -323,6 +332,7 @@
323 332 * @return
324 333 */
325 334 public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult){
  335 + List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
326 336 DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
327 337 DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
328 338 if(StringUtils.isNotEmpty(dataresult.getApplyDate())){
... ... @@ -372,6 +382,10 @@
372 382 return diagnosisManagerResult;
373 383 }
374 384 for(DiagnosisModel diagnosisModel : diaList){
  385 + mList.add(diagnosisModel.contomap());
  386 + if(StringUtils.isEmpty(diagnosisModel.getParentId())){
  387 + continue;
  388 + }
375 389 SieveQuery sieveQuery = new SieveQuery();
376 390 sieveQuery.setParentId(diagnosisModel.getParentId());
377 391 //查询产筛list