smartor.git - Gitblit

			@@ -647,6 +647,21 @@
			}).collect(Collectors.toList());
			patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10());
			patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
			//只有诊断名称没有诊断码的数据
			if(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname())
			&& !StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code())){
			Icd10 icd10 = new Icd10();
			icd10.setIcdname(patMedInhosp1.getLeavediagname());
			icd10.setDelFlag("0");
			icd10.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
			//丽水无院区，默认值是 1
			icd10.setCampusid("1");
			//通过icdCode查询一下，是否存在
			List<Icd10> icd10s = icd10Mapper.exactQueryIcd10List(icd10);
			if(CollectionUtils.isEmpty(icd10s)){
			patMedInhosp1.setLeaveicd10code(icd10s.get(0).getIcdcode());
			}
			}
			//patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
			patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
			}
			@@ -812,16 +827,31 @@
			}).collect(Collectors.toList());
			patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10());
			patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
			//只有诊断名称没有诊断码的数据
			if(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname())
			&& !StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code())){
			Icd10 icd10 = new Icd10();
			icd10.setIcdname(patMedInhosp1.getLeavediagname());
			icd10.setDelFlag("0");
			icd10.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
			//丽水无院区，默认值是 1
			icd10.setCampusid("1");
			//通过icdCode查询一下，是否存在
			List<Icd10> icd10s = icd10Mapper.exactQueryIcd10List(icd10);
			if(CollectionUtils.isEmpty(icd10s)){
			patMedInhosp1.setLeaveicd10code(icd10s.get(0).getIcdcode());
			}
			}
			//patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
			patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
			}

			String orgid = ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null;
			if(StringUtils.isNotEmpty(orgid) && orgid.equals("47246103233112211A1001")){
			//缙云二院住院记录不更新状态
			}else {
			patMedInhosp1.setInhospstate("1");
			}
			// if(StringUtils.isNotEmpty(orgid) && orgid.equals("47246103233112211A1001")){
			// //缙云二院住院记录不更新状态
			// }else {
			// patMedInhosp1.setInhospstate("1");
			// }

			if (CollectionUtils.isNotEmpty(patMedInhospList)) {
			patMedInhosp1.setUpdateTime(new Date());
			@@ -1031,6 +1061,21 @@
			}).collect(Collectors.toList());
			patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10());
			patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
			//只有诊断名称没有诊断码的数据
			if(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname())
			&& !StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code())){
			Icd10 icd10 = new Icd10();
			icd10.setIcdname(patMedInhosp1.getLeavediagname());
			icd10.setDelFlag("0");
			icd10.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
			//丽水无院区，默认值是 1
			icd10.setCampusid("1");
			//通过icdCode查询一下，是否存在
			List<Icd10> icd10s = icd10Mapper.exactQueryIcd10List(icd10);
			if(CollectionUtils.isEmpty(icd10s)){
			patMedInhosp1.setLeaveicd10code(icd10s.get(0).getIcdcode());
			}
			}
			//patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
			patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
			}
			@@ -1797,6 +1842,7 @@
			Map yeWuXX = (Map) dataMap.get("YeWuXX");
			Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
			Map<String, Object> JianChaSQ = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaSQ") : null;
			Map<String, Object> JianChaBG = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaBG") : null;
			List<HashMap<String, Object>> JianChaBWList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("JianChaBWList") : null;
			List<HashMap<String, Object>> ZhenDuanList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("ZhenDuanList") : null;
			List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(BingRenXX) ? (List<HashMap<String, Object>>) BingRenXX.get("DiZhiXXList") : null;
			@@ -1891,6 +1937,9 @@
			}
			}
			}
			if (ObjectUtils.isNotEmpty(JianChaBG)) {
			patMedInspection.setAppliyid(ObjectUtils.isNotEmpty(JianChaBG.get("ShenQingDID")) ? JianChaBG.get("ShenQingDID").toString() : null);
			}
			if (CollectionUtils.isNotEmpty(JianChaBWList)) {
			List<ExternalInspectionJC> externalInspectionJC = JianChaBWList.stream().map(map -> {
			ExternalInspectionJC info = new ExternalInspectionJC();