|  | @ -1049,7 +1049,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |                 wlyyPrescriptionInfoVOS.add(prescriptionInfoVO);
 |  |                 wlyyPrescriptionInfoVOS.add(prescriptionInfoVO);
 | 
												
													
														
															|  |             }
 |  |             }
 | 
												
													
														
															|  |             //诊断
 |  |             //诊断
 | 
												
													
														
															|  |             synPrescriptionDiagnosis(prescriptionVO);
 |  | 
 | 
												
													
														
															|  | 
 |  |             synPrescriptionDiagnosis(prescriptionVO,code);
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |             prescriptionVO.setInfoVOs(wlyyPrescriptionInfoVOS);
 |  |             prescriptionVO.setInfoVOs(wlyyPrescriptionInfoVOS);
 | 
												
													
														
															|  |             synPrecriptionHis(prescriptionVO,code);
 |  |             synPrecriptionHis(prescriptionVO,code);
 | 
												
											
												
													
														
															|  | @ -1113,7 +1113,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |      * @throws Exception
 |  |      * @throws Exception
 | 
												
													
														
															|  |      */
 |  |      */
 | 
												
													
														
															|  |     public JSONArray fingHlwGhmx(String patient,String doctor) throws Exception{
 |  |     public JSONArray fingHlwGhmx(String patient,String doctor) throws Exception{
 | 
												
													
														
															|  |         String sql = "select v.SBXH,to_char(v.ghsj,'yyyy-mm-dd hh24:mi:ss') as GHSJ from v_hlw_ghmx v where v.brid = '"+patient+"' and v.ysdm =" +
 |  | 
 | 
												
													
														
															|  | 
 |  |         String sql = "select v.SBXH,v.GHXH,to_char(v.ghsj,'yyyy-mm-dd hh24:mi:ss') as GHSJ from v_hlw_ghmx v where v.brid = '"+patient+"' and v.ysdm =" +
 | 
												
													
														
															|  |                 " '"+doctor+"' and v.ghsj > to_date('"+DateUtil.dateToStrLong(DateUtil.getToday())+"','yyyy-MM-dd HH24:mi:ss')";
 |  |                 " '"+doctor+"' and v.ghsj > to_date('"+DateUtil.dateToStrLong(DateUtil.getToday())+"','yyyy-MM-dd HH24:mi:ss')";
 | 
												
													
														
															|  |         JSONArray array = new JSONArray();
 |  |         JSONArray array = new JSONArray();
 | 
												
													
														
															|  |         Map<String,Object> params = new HashedMap();
 |  |         Map<String,Object> params = new HashedMap();
 | 
												
											
												
													
														
															|  | @ -1135,7 +1135,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |      * 诊断
 |  |      * 诊断
 | 
												
													
														
															|  |      * @param wlyyPrescriptionVO
 |  |      * @param wlyyPrescriptionVO
 | 
												
													
														
															|  |      */
 |  |      */
 | 
												
													
														
															|  |     public void synPrescriptionDiagnosis(WlyyPrescriptionVO wlyyPrescriptionVO) throws Exception{
 |  | 
 | 
												
													
														
															|  | 
 |  |     public void synPrescriptionDiagnosis(WlyyPrescriptionVO wlyyPrescriptionVO,String code) throws Exception{
 | 
												
													
														
															|  |         String doctor = wlyyPrescriptionVO.getDoctor();
 |  |         String doctor = wlyyPrescriptionVO.getDoctor();
 | 
												
													
														
															|  |         DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
 |  |         DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
 | 
												
													
														
															|  |         String patient = wlyyPrescriptionVO.getPatientCode();
 |  |         String patient = wlyyPrescriptionVO.getPatientCode();
 | 
												
											
												
													
														
															|  | @ -1190,6 +1190,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |             JSONObject json = ja.getJSONObject(0);
 |  |             JSONObject json = ja.getJSONObject(0);
 | 
												
													
														
															|  |             hlwGhmxDO.setSBXH(json.getInteger("SBXH"));
 |  |             hlwGhmxDO.setSBXH(json.getInteger("SBXH"));
 | 
												
													
														
															|  |             hlwGhmxDO.setGHSJ(DateUtil.strToDate(json.getString("GHSJ")));
 |  |             hlwGhmxDO.setGHSJ(DateUtil.strToDate(json.getString("GHSJ")));
 | 
												
													
														
															|  | 
 |  |             GHXH = json.getInteger("GHXH");
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |             String jsonString = JSONObject.toJSONString(hlwGhmxDO);
 |  |             String jsonString = JSONObject.toJSONString(hlwGhmxDO);
 | 
												
													
														
															|  |             Map<String,Object> params = new HashedMap();
 |  |             Map<String,Object> params = new HashedMap();
 | 
												
											
												
													
														
															|  | @ -1226,22 +1227,66 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         Integer icd10Flag = 0;
 |  |         Integer icd10Flag = 0;
 | 
												
													
														
															|  |         Integer jzxh = 0;
 |  | 
 | 
												
													
														
															|  |         List<WlyyPrescriptionDiagnosisDO> diagnosisDOs = prescriptionDiagnosisDao.findByPrescriptionId(wlyyPrescriptionVO.getId());
 |  | 
 | 
												
													
														
															|  |         for (WlyyPrescriptionDiagnosisDO diagnosisDO : diagnosisDOs){
 |  | 
 | 
												
													
														
															|  |             //疾病诊断表HLWYS_MZ_JBZD
 |  | 
 | 
												
													
														
															|  |             HlwYsMzJbzdDO hlwYsMzJbzdDO = new HlwYsMzJbzdDO();
 |  | 
 | 
												
													
														
															|  |             //hlwYsMzJbzdDO.setJLBH(0);
 |  | 
 | 
												
													
														
															|  |             hlwYsMzJbzdDO.setYSDM(doctorMappingDO.getMappingCode());
 |  | 
 | 
												
													
														
															|  |             hlwYsMzJbzdDO.setICD(diagnosisDO.getCode());
 |  | 
 | 
												
													
														
															|  |             hlwYsMzJbzdDO.setMSZD(diagnosisDO.getName());
 |  | 
 | 
												
													
														
															|  | 
 |  |         List<WlyyPrescriptionDiagnosisDO> diagnosisDOs = prescriptionDiagnosisDao.findByPrescriptionId(code);
 | 
												
													
														
															|  | 
 |  |         if(diagnosisDOs!=null&&diagnosisDOs.size()>0){
 | 
												
													
														
															|  | 
 |  |             WlyyPrescriptionDiagnosisDO diagnosisDO = diagnosisDOs.get(0);
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |             //就诊历史表HLWYS_MZ_JZLS
 | 
												
													
														
															|  | 
 |  |             HlwYsMzJzLsDO hlwYsMzJzLsDO = new HlwYsMzJzLsDO();
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJzLsDO.setJZXH(0);
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJzLsDO.setGHXH(GHXH);
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJzLsDO.setBRBH(Integer.parseInt(patientMappingDO.getMappingCode()));
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJzLsDO.setKSDM(Integer.parseInt(wlyyPrescriptionVO.getDept()));
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJzLsDO.setYSDM(doctorMappingDO.getMappingCode());
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJzLsDO.setKSSJ(DateUtil.strToDate(DateUtil.dateToStr(wlyyPrescriptionVO.getCreateTime(),"yyyy-MM-dd HH:mm:ss")));
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJzLsDO.setJSSJ(DateUtil.getNight23());
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJzLsDO.setJZZT(9);
 | 
												
													
														
															|  | 
 |  |             if (StringUtils.isNoneBlank(wlyyPrescriptionVO.getAdmNo())){
 | 
												
													
														
															|  | 
 |  |                 hlwYsMzJzLsDO.setJZXH(Integer.parseInt(wlyyPrescriptionVO.getAdmNo()));
 | 
												
													
														
															|  | 
 |  |             }
 | 
												
													
														
															|  | 
 |  |             //V_HLW_ICD10.FLAG
 | 
												
													
														
															|  |             JSONArray jsonArray2 = findHisIcd10(diagnosisDO.getCode());
 |  |             JSONArray jsonArray2 = findHisIcd10(diagnosisDO.getCode());
 | 
												
													
														
															|  |             if(jsonArray2!=null&&jsonArray2.size()>0){
 |  |             if(jsonArray2!=null&&jsonArray2.size()>0){
 | 
												
													
														
															|  |                 //获取居民信息
 |  |                 //获取居民信息
 | 
												
													
														
															|  |                 JSONObject json = jsonArray2.getJSONObject(0);
 |  |                 JSONObject json = jsonArray2.getJSONObject(0);
 | 
												
													
														
															|  |                 icd10Flag = json.getInteger("FLAG");
 |  |                 icd10Flag = json.getInteger("FLAG");
 | 
												
													
														
															|  |                 hlwYsMzJbzdDO.setJBBH(icd10Flag);
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |             }
 |  |             }
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJzLsDO.setZYZD(icd10Flag);
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |             String jsonString2 = JSONObject.toJSONString(hlwYsMzJzLsDO);
 | 
												
													
														
															|  | 
 |  |             Map<String,Object> params2 = new HashedMap();
 | 
												
													
														
															|  | 
 |  |             params2.put("json",jsonString2);
 | 
												
													
														
															|  | 
 |  |             params2.put("table","HlwYsMzJzLsDO");
 | 
												
													
														
															|  | 
 |  |             logger.info("HlwYsMzJzLsDO:"+jsonString2);
 | 
												
													
														
															|  | 
 |  |             HttpResponse response2 = HttpUtils.doGet(saveUrl,params2);
 | 
												
													
														
															|  | 
 |  |             if (response2.getStatus()==200){
 | 
												
													
														
															|  | 
 |  |                 String content = response2.getContent();
 | 
												
													
														
															|  | 
 |  |                 logger.info("content"+content);
 | 
												
													
														
															|  | 
 |  |                 //获取就诊序号,更新处方表数据
 | 
												
													
														
															|  | 
 |  |                 JSONObject jsonObject = JSONObject.parseObject(content);
 | 
												
													
														
															|  | 
 |  |                 JSONObject object = jsonObject.getJSONObject("obj");
 | 
												
													
														
															|  | 
 |  |                 if (object!=null){
 | 
												
													
														
															|  | 
 |  |                     Integer jzxh = object.getInteger("jzxh");
 | 
												
													
														
															|  | 
 |  |                     wlyyPrescriptionVO.setAdmNo(jzxh+"");
 | 
												
													
														
															|  | 
 |  |                     logger.info("JZXH=========="+jzxh);
 | 
												
													
														
															|  | 
 |  |                     List<WlyyPrescriptionDO> wlyyPrescriptionDOS = prescriptionDao.findById(code);
 | 
												
													
														
															|  | 
 |  |                     if (wlyyPrescriptionDOS!=null&&wlyyPrescriptionDOS.size()!=0){
 | 
												
													
														
															|  | 
 |  |                         WlyyPrescriptionDO wlyyPrescriptionDO = wlyyPrescriptionDOS.get(0);
 | 
												
													
														
															|  | 
 |  |                         wlyyPrescriptionDO.setAdmNo(jzxh+"");
 | 
												
													
														
															|  | 
 |  |                         prescriptionDao.save(wlyyPrescriptionDO);
 | 
												
													
														
															|  | 
 |  |                     }
 | 
												
													
														
															|  | 
 |  |                 }
 | 
												
													
														
															|  | 
 |  |                 logger.info("表hlwYsMzJzLsDO同步成功!");
 | 
												
													
														
															|  | 
 |  |             }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |             //疾病诊断表HLWYS_MZ_JBZD
 | 
												
													
														
															|  | 
 |  |             HlwYsMzJbzdDO hlwYsMzJbzdDO = new HlwYsMzJbzdDO();
 | 
												
													
														
															|  | 
 |  |             //hlwYsMzJbzdDO.setJLBH(0);
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJbzdDO.setYSDM(doctorMappingDO.getMappingCode());
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJbzdDO.setICD(diagnosisDO.getCode());
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJbzdDO.setMSZD(diagnosisDO.getName());
 | 
												
													
														
															|  | 
 |  |             hlwYsMzJbzdDO.setJBBH(icd10Flag);
 | 
												
													
														
															|  |             hlwYsMzJbzdDO.setBRBH(Integer.valueOf(patientMappingDO.getMappingCode()));
 |  |             hlwYsMzJbzdDO.setBRBH(Integer.valueOf(patientMappingDO.getMappingCode()));
 | 
												
													
														
															|  |             hlwYsMzJbzdDO.setZDLB(11);//诊断类别
 |  |             hlwYsMzJbzdDO.setZDLB(11);//诊断类别
 | 
												
													
														
															|  |             hlwYsMzJbzdDO.setZDSJ(DateUtil.strToDate(DateUtil.dateToStr(wlyyPrescriptionVO.getCreateTime(),"yyyy-MM-dd HH:mm:ss")));//诊断时间
 |  |             hlwYsMzJbzdDO.setZDSJ(DateUtil.strToDate(DateUtil.dateToStr(wlyyPrescriptionVO.getCreateTime(),"yyyy-MM-dd HH:mm:ss")));//诊断时间
 | 
												
											
												
													
														
															|  | @ -1251,6 +1296,9 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |             hlwYsMzJbzdDO.setJBMC(diagnosisDO.getName());//诊断名称
 |  |             hlwYsMzJbzdDO.setJBMC(diagnosisDO.getName());//诊断名称
 | 
												
													
														
															|  |             hlwYsMzJbzdDO.setZDLX(1);//诊断类型
 |  |             hlwYsMzJbzdDO.setZDLX(1);//诊断类型
 | 
												
													
														
															|  |             hlwYsMzJbzdDO.setTJBZ(1);//提交标志
 |  |             hlwYsMzJbzdDO.setTJBZ(1);//提交标志
 | 
												
													
														
															|  | 
 |  |             if (StringUtils.isNoneBlank(wlyyPrescriptionVO.getAdmNo())){
 | 
												
													
														
															|  | 
 |  |                 hlwYsMzJbzdDO.setJZXH(Integer.parseInt(wlyyPrescriptionVO.getAdmNo()));
 | 
												
													
														
															|  | 
 |  |             }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |             String jsonString1 = JSONObject.toJSONString(hlwYsMzJbzdDO);
 |  |             String jsonString1 = JSONObject.toJSONString(hlwYsMzJbzdDO);
 | 
												
													
														
															|  |             Map<String,Object> params1 = new HashedMap();
 |  |             Map<String,Object> params1 = new HashedMap();
 | 
												
											
												
													
														
															|  | @ -1261,53 +1309,10 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |             if (response1.getStatus()==200){
 |  |             if (response1.getStatus()==200){
 | 
												
													
														
															|  |                 String content = response1.getContent();
 |  |                 String content = response1.getContent();
 | 
												
													
														
															|  |                 logger.info("content"+content);
 |  |                 logger.info("content"+content);
 | 
												
													
														
															|  |                 //获取就诊序号,更新处方表数据
 |  | 
 | 
												
													
														
															|  |                 JSONObject jsonObject = JSONObject.parseObject(content);
 |  | 
 | 
												
													
														
															|  |                 JSONObject object = jsonObject.getJSONObject("obj");
 |  | 
 | 
												
													
														
															|  |                 if (object!=null){
 |  | 
 | 
												
													
														
															|  |                     jzxh = object.getInteger("JZXH");
 |  | 
 | 
												
													
														
															|  |                     wlyyPrescriptionVO.setAdmNo(jzxh+"");
 |  | 
 | 
												
													
														
															|  |                     logger.info("JZXH=========="+jzxh);
 |  | 
 | 
												
													
														
															|  |                     List<WlyyPrescriptionDO> wlyyPrescriptionDOS = prescriptionDao.findById(wlyyPrescriptionVO.getId());
 |  | 
 | 
												
													
														
															|  |                     if (wlyyPrescriptionDOS!=null&&wlyyPrescriptionDOS.size()!=0){
 |  | 
 | 
												
													
														
															|  |                         WlyyPrescriptionDO wlyyPrescriptionDO = wlyyPrescriptionDOS.get(0);
 |  | 
 | 
												
													
														
															|  |                         wlyyPrescriptionDO.setAdmNo(jzxh+"");
 |  | 
 | 
												
													
														
															|  |                         prescriptionDao.save(wlyyPrescriptionDO);
 |  | 
 | 
												
													
														
															|  |                     }
 |  | 
 | 
												
													
														
															|  |                 }
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |                 logger.info("表hlwYsMzJbzdDO同步成功!");
 |  |                 logger.info("表hlwYsMzJbzdDO同步成功!");
 | 
												
													
														
															|  |             }
 |  |             }
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         //就诊历史表HLWYS_MZ_JZLS
 |  | 
 | 
												
													
														
															|  |         HlwYsMzJzLsDO hlwYsMzJzLsDO = new HlwYsMzJzLsDO();
 |  | 
 | 
												
													
														
															|  |         hlwYsMzJzLsDO.setJZXH(0);
 |  | 
 | 
												
													
														
															|  |         hlwYsMzJzLsDO.setGHXH(GHXH);
 |  | 
 | 
												
													
														
															|  |         hlwYsMzJzLsDO.setBRBH(Integer.parseInt(patientMappingDO.getMappingCode()));
 |  | 
 | 
												
													
														
															|  |         hlwYsMzJzLsDO.setKSDM(Integer.parseInt(wlyyPrescriptionVO.getDept()));
 |  | 
 | 
												
													
														
															|  |         hlwYsMzJzLsDO.setYSDM(doctorMappingDO.getMappingCode());
 |  | 
 | 
												
													
														
															|  |         hlwYsMzJzLsDO.setKSSJ(DateUtil.strToDate(DateUtil.dateToStr(wlyyPrescriptionVO.getCreateTime(),"yyyy-MM-dd HH:mm:ss")));
 |  | 
 | 
												
													
														
															|  |         hlwYsMzJzLsDO.setJSSJ(DateUtil.getNight23());
 |  | 
 | 
												
													
														
															|  |         hlwYsMzJzLsDO.setJZZT(9);
 |  | 
 | 
												
													
														
															|  |         if (StringUtils.isNoneBlank(wlyyPrescriptionVO.getAdmNo())){
 |  | 
 | 
												
													
														
															|  |             hlwYsMzJzLsDO.setJZXH(Integer.parseInt(wlyyPrescriptionVO.getAdmNo()));
 |  | 
 | 
												
													
														
															|  |         }
 |  | 
 | 
												
													
														
															|  |         //V_HLW_ICD10.FLAG
 |  | 
 | 
												
													
														
															|  |         hlwYsMzJzLsDO.setZYZD(icd10Flag);
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         String jsonString2 = JSONObject.toJSONString(hlwYsMzJzLsDO);
 |  | 
 | 
												
													
														
															|  |         Map<String,Object> params2 = new HashedMap();
 |  | 
 | 
												
													
														
															|  |         params2.put("json",jsonString2);
 |  | 
 | 
												
													
														
															|  |         params2.put("table","HlwYsMzJzLsDO");
 |  | 
 | 
												
													
														
															|  |         logger.info("HlwYsMzJzLsDO:"+jsonString2);
 |  | 
 | 
												
													
														
															|  |         HttpResponse response2 = HttpUtils.doGet(saveUrl,params2);
 |  | 
 | 
												
													
														
															|  |         if (response2.getStatus()==200){
 |  | 
 | 
												
													
														
															|  |             logger.info("content"+response2.getContent());
 |  | 
 | 
												
													
														
															|  |             logger.info("表hlwYsMzJzLsDO同步成功!");
 |  | 
 | 
												
													
														
															|  |         }
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     public WlyyPrescriptionVO synPrecriptionHis(WlyyPrescriptionVO wlyyPrescriptionVO,String code) throws Exception {
 |  |     public WlyyPrescriptionVO synPrecriptionHis(WlyyPrescriptionVO wlyyPrescriptionVO,String code) throws Exception {
 |