smartor代码库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
sinake
4 天以前 a389acecd582e81c34037326d5808152f97efffb 
 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java


@@ -283,6 +283,8 @@


        externalInHospPatientInfo.setZhuZhiYSID(externalInDeptPatientInfo.getZhuZhiYSID());


        externalInHospPatientInfo.setZhuZhiYSXM(externalInDeptPatientInfo.getZhuZhiYSXM());


        externalInHospPatientInfo.setRuYuanSJ(externalInDeptPatientInfo.getRuYuanSJ());


        externalInHospPatientInfo.setJingGuanYSID(externalInDeptPatientInfo.getJingGuanYSID());


        externalInHospPatientInfo.setJingGuanYSXM(externalInDeptPatientInfo.getJingGuanYSXM());


        externalInHospPatientInfo.setLianXiDH(ObjectUtils.isNotEmpty(BingRenXX.get("LianXiDH")) ? BingRenXX.get("LianXiDH").toString() : null);


        externalInHospPatientInfo.setDangQianCWID(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianCWID")) ? BingRenXX.get("DangQianCWID").toString() : null);


        externalInHospPatientInfo.setDangQianCWMC(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianCWMC")) ? BingRenXX.get("DangQianCWMC").toString() : null);


@@ -889,6 +891,19 @@


        patMedOuthosp.setOuthospno(externalInHospPatientInfo.getBingAnHao());


        patMedOuthosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());


        List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.selectPatMedOuthospList(patMedOuthosp);


        for (PatMedOuthosp patMedOuthosp1 : patMedOuthosps) {


            PatArchive pa = patArchiveMapper.selectPatArchiveByPatid(patMedOuthosp1.getPatid());


            if (patArchive.getBirthdate() != null) {


                Map<String, String> map = calculateAge(pa.getBirthdate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());


                pa.setAge(ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);


                pa.setAgeUnit(map.get("ageUnit"));


                pa.setAge2(ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);


                pa.setAgeUnit2(map.get("ageUnit2"));


                patMedOuthosp1.setAge(pa.getAge() + pa.getAgeUnit() + pa.getAge2() + pa.getAgeUnit2());


                patMedOuthosp1.setTelcode(patArchive.getTelcode());


                patMedOuthosp1.setIdcardno(patArchive.getIdcardno());


            }


        }




        patMedOuthosp.setPatid(patArchive.getId());


        patMedOuthosp.setPatno(externalInHospPatientInfo.getBingAnHao());


@@ -900,6 +915,7 @@


        patMedOuthosp.setAdmitdate(externalJZInfo.getJiuZhenRQ());


        patMedOuthosp.setOrgid(FaSongJGID);


        patMedOuthosp.setHospitalname(FaSongJGMC);


        patMedOuthosp.setIdcardno(patArchive.getIdcardno());




        //这个需要等HIS那边告诉取哪个字段，现在还是不对的


        patMedOuthosp.setFudate(externalJZInfo.getSfrq());


@@ -941,7 +957,7 @@


        }




        //先通过身份证和科室查询该患者是否有需要随访的(景宁提出来的)


        if (patMedOuthosp.getOrgid().equals("47255004333112711A1001")) {


        if (patMedOuthosp.getOrgid().equals("47255004333112711A1001") && StringUtils.isNotEmpty(patMedOuthosp.getIdcardno()) && StringUtils.isNotEmpty(patMedOuthosp.getDeptcode())) {


            ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();


            serviceSubtaskVO.setSfzh(patMedOuthosp.getIdcardno());


            serviceSubtaskVO.setDeptcode(patMedOuthosp.getDeptcode());


@@ -951,6 +967,7 @@


                for (ServiceSubtask serviceSubtask : serviceSubtaskList) {


                    serviceSubtask.setSendstate(6L);


                    serviceSubtask.setRemark("患者已经回来复诊");


                    serviceSubtask.setUpdateTime(new Date());


                    serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);


                }


            }


@@ -1361,6 +1378,8 @@


            patMedInhosp.setDrcode(externalInHospPatientInfo.getZhuZhiYSID());


            patMedInhosp.setNurseId(externalInHospPatientInfo.getZeRenHSID());


            patMedInhosp.setNurseName(externalInHospPatientInfo.getZeRenHSXM());


            patMedInhosp.setManagementDoctor(externalInHospPatientInfo.getJingGuanYSXM());


            patMedInhosp.setManagementDoctorCode(externalInHospPatientInfo.getJingGuanYSID());


        }


        if (ObjectUtils.isNotEmpty(externalInHospPatientDiagnoseInfo)) {


//            patMedInhosp.setIcd10code(StringUtils.isNotEmpty(patMedInhosp.getIcd10code()) ? patMedInhosp.getIcd10code() + "," + externalInHospPatientDiagnoseInfo.getZhenDuanID() : externalInHospPatientDiagnoseInfo.getZhenDuanID());