jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f233ff23ade42097eb545a5c4ce3519726a8bf94

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

update

Showing 3 changed files with 64 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java View file @ f233ff2
... ... @@ -256,6 +256,15 @@
256 256 }
257 257  
258 258  
  259 + Date dueTime = null;
  260 + try{
  261 + dueTime = fmt.parse(item.getJlrq());
  262 + }catch (Exception e)
  263 + {
  264 + dueTime = fmt2.parse(item.getJlrq());
  265 + }
  266 +
  267 +
259 268 FmPatInfo patInfo = getFmPatInfoById(item.getSyxh());
260 269 if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone())) {
261 270 PatientsQuery query = new PatientsQuery();
... ... @@ -367,7 +376,7 @@
367 376 baby.setDeformity("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形
368 377 baby.setAsphyxiaM(item.getZx()); //窒息分钟
369 378 baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item.getCcqk())); // 妊娠结局
370   - baby.setDueTime(fmt1.format(dueDate));//分娩时间
  379 + baby.setDueTime(fmt1.format(dueTime));//分娩时间
371 380 babies.add(baby);
372 381 deliverAddRequest.setBabies(babies);
373 382 deliverAddRequest.setFmHospital("216"); //设置为秦皇岛分娩医院
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ f233ff2
... ... @@ -372,8 +372,8 @@
372 372 List<LisReportModel> reportModelList = new ArrayList<>();
373 373 //通过就诊卡号和医院id查询到医院下面的lis记录
374 374 if (StringUtils.isNotEmpty(vcCardNo)) {
375   - //德州
376   - if ("6".equals(HIS_VERSION)) {
  375 + //德州市妇幼
  376 + if ("1000000114".equals(model.getHospitalId())) {
377 377 model.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo));
378 378 }
379 379 //承德查询lis
380 380  
381 381  
382 382  
... ... @@ -382,18 +382,22 @@
382 382 model.setVcCardNo(cdfyHisService.getIdByVcCardNo(vcCardNo));
383 383 }
384 384 //威县人民医院lis
385   - else if ("20".equals(HIS_VERSION)) {
  385 + else if ("199".equals(model.getHospitalId())) {
386 386 model.setVcCardNo(wxrmyyHisService.findId(vcCardNo));
387 387 }
388 388 //诸城
389   - else if ("21".equals(HIS_VERSION)) {
  389 + else if ("2100001634".equals(model.getHospitalId())) {
390 390 //model.setVcCardNo(getZcVcardNo(vcCardNo));
391 391 model.setVcCardNos(zcfyHisService.getZcVcCardNos(vcCardNo));
392 392 }
393 393 //威海市妇幼 因为威海市妇幼有些孕妇没有就诊卡直接用身份证，lis把身份证号码存在就诊卡号字段的
394   - else if ("22".equals(HIS_VERSION)&&perType==1) {
  394 + else if ("2100001635".equals(model.getHospitalId())&&perType==1) {
395 395 model.setVcCardNo(cardNo);
396 396 }
  397 + //仪陇县人民医院 就诊卡号字段存的身份证号码
  398 + else if ("2100001718".equals(model.getHospitalId())&&perType==1) {
  399 + model.setVcCardNo(cardNo);
  400 + }
397 401 //秦皇岛工人医院lis数据查询，就诊卡号字段保存的是病人ID
398 402 else if("2100001097".equals(model.getHospitalId())){
399 403 model.setVcCardNo(gryyHisService.getIdByVcCardNo(vcCardNo));
400 404  
... ... @@ -524,9 +528,22 @@
524 528 vcCardNos.add(cdfyHisService.getIdByVcCardNo(pat.getVcCardNo()));
525 529 }
526 530 //威海市妇幼 因为威海市妇幼有些孕妇没有就诊卡直接用身份证，lis把身份证号码存在就诊卡号字段的
527   - else if ("22".equals(HIS_VERSION)) {
  531 + else if ("2100001635".equals(pat.getHospitalId())) {
528 532 vcCardNos.add(pat.getCardNo());
529   - } else {
  533 + }
  534 + //诸城
  535 + else if ("2100001634".equals(pat.getHospitalId())) {
  536 + //model.setVcCardNo(getZcVcardNo(vcCardNo));
  537 + vcCardNos.addAll(zcfyHisService.getZcVcCardNos(pat.getVcCardNo()));
  538 + }
  539 + //秦皇岛工人医院lis数据查询，就诊卡号字段保存的是病人ID
  540 + else if("2100001097".equals(pat.getHospitalId())){
  541 + vcCardNos.add(gryyHisService.getIdByVcCardNo(pat.getVcCardNo()));
  542 + }
  543 + //仪陇县人民医院 就诊卡号字段存的身份证号码
  544 + else if ("2100001718".equals(pat.getHospitalId())) {
  545 + vcCardNos.add(pat.getCardNo());
  546 + }else {
530 547 vcCardNos.add(pat.getVcCardNo());
531 548 }
532 549  
... ... @@ -719,7 +736,7 @@
719 736 end = lises.size();
720 737 }
721 738 final List<LisReportModel> models = lises.subList(i, end);
722   - Callable c = new LisHandleTask(patientsService, models, map, dzfyHisService, cdfyHisService);
  739 + Callable c = new LisHandleTask(patientsService, models, map, dzfyHisService, cdfyHisService,gryyHisService, zcfyHisService);
723 740 Future f = commonThreadPool.submit(c);
724 741 futures.add(f);
725 742 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java View file @ f233ff2
... ... @@ -2,6 +2,8 @@
2 2  
3 3 import com.lyms.hospitalapi.Cdfy.CdfyHisService;
4 4 import com.lyms.hospitalapi.dzfy.DzfyHisService;
  5 +import com.lyms.hospitalapi.gryy.GryyHisService;
  6 +import com.lyms.hospitalapi.zcfy.ZcfyHisService;
5 7 import com.lyms.platform.biz.service.PatientsService;
6 8 import com.lyms.platform.common.enums.YnEnums;
7 9 import com.lyms.platform.common.utils.DateUtil;
8 10  
9 11  
... ... @@ -30,17 +32,23 @@
30 32 private Map<String, String> hospitalMap;
31 33 private DzfyHisService dzfyHisService;
32 34 private CdfyHisService cdfyHisService;
  35 + private GryyHisService gryyHisService;
  36 + private ZcfyHisService zcfyHisService;
33 37  
34 38 public LisHandleTask(PatientsService patientsService,List<LisReportModel> lises,
35 39 Map<String, String> hospitalMap,
36 40 DzfyHisService dzfyHisService,
37   - CdfyHisService cdfyHisService)
  41 + CdfyHisService cdfyHisService,
  42 + GryyHisService gryyHisService,
  43 + ZcfyHisService zcfyHisService)
38 44 {
39 45 this.patientsService = patientsService;
40 46 this.lises = lises;
41 47 this.hospitalMap = hospitalMap;
42 48 this.dzfyHisService = dzfyHisService;
43 49 this.cdfyHisService = cdfyHisService;
  50 + this.gryyHisService = gryyHisService;
  51 + this.zcfyHisService = zcfyHisService;
44 52 }
45 53  
46 54 @Override
47 55  
48 56  
... ... @@ -67,15 +75,31 @@
67 75 {
68 76  
69 77 //德州市妇幼保健院 解决德州妇幼孕妇换卡的问题
70   - if ("6".equals(HIS_VERSION) && "1000000114".equals(lisReportModel.getHospitalId()))
  78 + if ("1000000114".equals(lisReportModel.getHospitalId()))
71 79 {
72 80 patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(lisReportModel.getVcCardNo()));
73 81 }
74 82 //承德查询lis
75   - else if ("16".equals(HIS_VERSION))
  83 + else if ("2100001291".equals(lisReportModel.getHospitalId()))
76 84 {
77   - patientsQuery.setVcCardNo(lisReportModel.getVcCardNo());
78   - //patientsQuery.setVcCardNo(cdfyHisService.getPatientIdByVcCardNo(lisReportModel.getVcCardNo()));
  85 + //patientsQuery.setVcCardNo(lisReportModel.getVcCardNo());
  86 + patientsQuery.setVcCardNo(cdfyHisService.getIdByVcCardNo(lisReportModel.getVcCardNo()));
  87 + }
  88 + //秦皇岛工人医院lis数据查询，就诊卡号字段保存的是病人ID
  89 + else if("2100001097".equals(lisReportModel.getHospitalId())){
  90 + patientsQuery.setVcCardNo(gryyHisService.getIdByVcCardNo(lisReportModel.getVcCardNo()));
  91 + }
  92 + //仪陇县人民医院 就诊卡号字段存的身份证号码
  93 + else if ("2100001718".equals(lisReportModel.getHospitalId())) {
  94 + patientsQuery.setCardNo(lisReportModel.getVcCardNo());
  95 + }
  96 + //诸城妇幼，通过就诊卡查询用过的所有就诊卡
  97 + else if ("2100001634".equals(lisReportModel.getHospitalId())) {
  98 + patientsQuery.setVcCardNos(zcfyHisService.getZcVcCardNos(lisReportModel.getVcCardNo()));
  99 + }
  100 + //威海市妇幼 因为威海市妇幼有些孕妇没有就诊卡直接用身份证，lis把身份证号码存在就诊卡号字段的
  101 + else if ("2100001635".equals(lisReportModel.getHospitalId())) {
  102 + patientsQuery.setCardNo(lisReportModel.getVcCardNo());
79 103 }
80 104 else
81 105 {