检查检验

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/RegisterService.java

@@ -66,7 +66,10 @@ public class RegisterService {
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>10</endNum>");
            sbs.append(" <Msg>");
            sbs.append(" and unit_code = '"+dept+"' and (request_day between '"+startDate+"' and '"+endDate+"') ");
            sbs.append(" and (request_day between '"+startDate+"' and '"+endDate+"') ");
            if(StringUtils.isNotBlank(dept)){
                sbs.append(" and unit_code ='"+dept+"'");
            }
            if(StringUtils.isNotBlank(doctor_code)){
                sbs.append(" and doctor_code ='"+doctor_code+"'");
            }
@@ -115,7 +118,7 @@ public class RegisterService {
            sbs.append(" <query compy=\"=\" item=\"unit_code\" splice=\"and\" value=\"'"+dept+"'\"/>");
            sbs.append(" <query compy=\"=\" item=\"doctor_code\" splice=\"and\" value=\"'"+doctor_code+"'\"/>");
            sbs.append(" <query compy=\"=\" item=\"CONVERT(varchar(100),yy_time,23)\" splice=\"and\" value=\"'"+date+"'\"/>");
            sbs.append(" <query compy=\"=\" item=\"yy_status\" splice=\"and\" value=\"'0'\"/>");
//            sbs.append(" <query compy=\"=\" item=\"yy_status\" splice=\"and\" value=\"'0'\"/>");
            sbs.append(" <query compy=\"=\" item=\"ampm\" splice=\"and\" value=\"'"+ampm+"'\"/>");
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);

business/base-service/src/main/java/com/yihu/jw/internet/service/DataGeneratorService.java

@@ -179,8 +179,8 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
        outpatientDO.setIcd10("ZZGX71");
        outpatientDO.setIcd10Name("肝血瘀阻证");
        outpatientDO.setRegisterNo(getCode());
        outpatientDO.setConNo(getCode());
        outpatientDO.setRegisterNo(getCode().substring(0,15));
        outpatientDO.setConNo(getCode().substring(0,15));
        outpatientDO.setPatientCancelRemark("test_info");
        return outpatientDao.save(outpatientDO);

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetService.java

@@ -795,22 +795,30 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("visit_dept_name", info.get("dept_name"));
                jb.put("pt_no", info.get("paName"));
                jb.put("pt_age", IdCardUtil.getAgeForIdcard(info.get("paId").toString()));
                jb.put("cost_type", info.get("charge_type").toString());
                jb.put("pt_birthdate", "");
                jb.put("ge_code", info.get("sex"));
//                jb.put("cost_type", info.get("charge_type").toString());
                jb.put("cost_type", "");
                jb.put("pt_birthdate", null);
                String sex = IdCardUtil.getSexForIdcard_new(info.get("paId").toString());
                jb.put("ge_code", sex=="3"?"9":sex);
                jb.put("pt_tel", info.get("moble"));
                jb.put("card_type", "1");
                jb.put("id_no", info.get("paId"));
                jb.put("pt_district", "");
                jb.put("pt_card_type", "");
                jb.put("pt_card_no",info.get("card_no"));
                jb.put("apply_time", info.get("create_time"));
                jb.put("visit_time", info.get("register_date"));
                Date createTime = (Date) info.get("create_time");
                jb.put("apply_time", DateUtil.dateToStr(createTime,"yyyy-MM-dd HH:mm:ss"));
                Date date = (Date) info.get("register_date");
                String dateStr = DateUtil.dateToStr(DateUtil.getPreDays(date,1),"yyyy-MMM-dd");
                jb.put("visit_time", DateUtil.dateToStr(date,"yyyy-MM-dd HH:mm:ss"));
                String dateStr = DateUtil.dateToStr(DateUtil.getPreDays(date,1),"yyyy-MM-dd");
                jb.put("visit_finish_time", dateStr+" 00:00:00");
                jb.put("old_diag_code", "");
                jb.put("old_diag_name", "");
                jb.put("diag_code",info.get("icd10"));
@@ -827,7 +835,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                dataError++;
                logger.error(e.toString());
            }
            String jbstr = jb.toJSONString();
            if(!errorFlag){
                JSONArray jsonArray = new JSONArray();
                jsonArray.add(jb);