Ver código fonte

Merge branch 'dev' of trick9191/wlyy2.0 into dev

trick9191 5 anos atrás
pai
commit
5a35ccdc80

+ 2 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

@ -97,7 +97,7 @@ public class YkyyEntranceService {
                    if(list!=null&&list.size()>0){
                        DictHospitalDeptDO deptDO = list.get(0);
                        deptDO.setName(deptjson.getString("name"));
                        deptDO.setConsultDeptFlag(deptjson.getString("consultdeptflag"));
                        deptDO.setConsultDeptFlag(deptjson.getString("consultDeptFlag"));
                        hospitalDeptDao.save(deptDO);
                    }else {
                        //新增
@ -105,7 +105,7 @@ public class YkyyEntranceService {
                        deptDO.setOrgCode(orgCode);
                        deptDO.setCode(code);
                        deptDO.setName(deptjson.getString("name"));
                        deptDO.setConsultDeptFlag(deptjson.getString("consultdeptflag"));
                        deptDO.setConsultDeptFlag(deptjson.getString("consultDeptFlag"));
                        deptDO.setCreateTime(new Date());
                        hospitalDeptDao.save(deptDO);
                    }

+ 46 - 222
business/base-service/src/main/java/com/yihu/jw/internet/service/ykyy/YkyyInternetService.java

@ -963,11 +963,25 @@ public class YkyyInternetService extends BaseJpaService<InternetUpErrorLogDO, In
        String token = upNsUserToken(url);
        String sql = "select a.id,a.real_order,a.patient_code,a.outpatient_id,a.patient_name\n" +
                " ,b.sex,b.birthday" +
                " ,b.idcard,b.mobile,b.city_code,a.hospital\n" +
                " ,a.hospital_name,p.icd10,p.icd10_name,p.dept,p.dept_name,a.doctor,a.doctor_name,a.his_register_fee,c.idcard as docIdcard\n" +
                "  from  wlyy_prescription a\n" +
        String sql = "select " +
                "  a.id," +
                "  a.real_order," +
                "  a.patient_code," +
                "  a.outpatient_id," +
                "  a.patient_name," +
                "  b.idcard," +
                "  b.city_code," +
                "  a.hospital," +
                "  a.hospital_name," +
                "  p.icd10," +
                "  p.icd10_name," +
                "  p.dept," +
                "  p.dept_name," +
                "  a.doctor," +
                "  a.doctor_name," +
                "  a.his_register_fee," +
                "  c.idcard as docIdcard" +
                "  from  wlyy_prescription a" +
                "         JOIN base_patient b on a.patient_code = b.id\n" +
                "         JOIN base_doctor c on a.doctor = c.id\n" +
                "         JOIN wlyy_outpatient p on p.id = a.outpatient_id\n " +
@ -1083,13 +1097,26 @@ public class YkyyInternetService extends BaseJpaService<InternetUpErrorLogDO, In
        int error = 0;
        int dataError = 0;
        String sql = "select b.real_order,a.id, a.prescription_id, a.drug_no,a.drug_name, a.dosage\n" +
                "      ,a.unit,a.quantity,a.pack_unit,a.usage_code,a.supply_code\n" +
                "      ,a.specification,a.pack_retprice,a.quantity,a.pack_retprice as drug_total_price\n" +
                "  from wlyy_prescription_info a \n" +
                "     JOIN wlyy_prescription b \n" +
                "             on b.id = a.prescription_id\n" +
                " where  a.dosage is not null and a.dosage <> '' and b.real_order is not null";
        String sql = "select " +
                "    b.real_order," +
                "    a.id, " +
                "    a.prescription_id, " +
                "    a.drug_no," +
                "    a.drug_name, " +
                "    a.dosage," +
                "    a.unit," +
                "    a.quantity," +
                "    a.pack_unit," +
                "    a.usage_code," +
                "    a.supply_code," +
                "    a.specification," +
                "    a.pack_retprice," +
                "    a.quantity," +
                "    a.pack_retprice as drug_total_price" +
                "  from wlyy_prescription_info a " +
                "     JOIN wlyy_prescription b " +
                "     on b.id = a.prescription_id\n" +
                " where  a.dosage is not null and b.real_order is not null";
        if(StringUtils.isNotBlank(startDate)){
            sql =  sql + "  and b.create_time >=  '" + startDate + "' ";
        }
@ -1431,222 +1458,19 @@ public class YkyyInternetService extends BaseJpaService<InternetUpErrorLogDO, In
    // 当科室信息在列表中不存在的情况,全部配置为预防保健科
    public static  String[]  depToSubject(String dep){
        String[] res = new String[2];
        res[0] = "1";
        res[1] = "预防保健科";
        res[0] = "10";
        res[1] = "眼科";
        switch (dep) {
            case "0":
                res[0] = "1";
                res[1] = "预防保健科";
                break;
            case "1120000":
                res[0] = "1";
                res[1] = "预防保健科";
                break;
            case "1170000":
                res[0] = "1";
                res[1] = "预防保健科";
                break;
            case "3160000":
                res[0] = "1";
                res[1] = "预防保健科";
                break;
            case "1310000":
                res[0] = "2";
                res[1] = "全科医疗科";
                break;
            case "1000001":
        if(StringUtils.isNotBlank(dep)){
            if("1010".equals(dep)){
                res[0] = "3";
                res[1] = "内科";
                break;
            case "1010000":
            }else if("1154".equals(dep)){
                res[0] = "3";
                res[1] = "内科";
                break;
            case "1010200":
                res[0] = "3.01";
                res[1] = "呼吸内科专业";
                break;
            case "1010100":
                res[0] = "3.02";
                res[1] = "消化内科专业";
                break;
            case "1140000":
                res[0] = "3.03";
                res[1] = "神经内科专业";
                break;
            case "1400000":
                res[0] = "3.04";
                res[1] = "心血管内科专业";
                break;
            case "1410000":
                res[0] = "3.04";
                res[1] = "心血管内科专业";
                break;
            case "1210000":
                res[0] = "3.05";
                res[1] = "血液内科专业";
                break;
            case "1010300":
                res[0] = "3.06";
                res[1] = "肾病学专业";
                break;
            case "1220000":
                res[0] = "3.07";
                res[1] = "内分泌专业";
                break;
            case "1010400":
                res[0] = "3.08";
                res[1] = "免疫学专业";
                break;
            case "1020000":
                res[0] = "4";
                res[1] = "外科";
                break;
            case "1020200":
                res[0] = "4";
                res[1] = "外科";
                break;
            case "1260000":
                res[0] = "4";
                res[1] = "外科";
                break;
            case "1520000":
                res[0] = "4";
                res[1] = "外科";
                break;
            case "1020100":
                res[0] = "4.01";
                res[1] = "普通外科专业";
                break;
            case "1150000":
                res[0] = "4.02";
                res[1] = "神经外科专业";
                break;
            case "1030000":
                res[0] = "4.03";
                res[1] = "骨科专业";
                break;
            case "1031000":
                res[0] = "4.03";
                res[1] = "骨科专业";
                break;
            case "1032000":
                res[0] = "4.03";
                res[1] = "骨科专业";
                break;
            case "1033000":
                res[0] = "4.03";
                res[1] = "骨科专业";
                break;
            case "1020300":
                res[0] = "4.04";
                res[1] = "泌尿外科专业";
                break;
            case "1020400":
                res[0] = "4.05";
                res[1] = "胸外科专业";
                break;
            case "1250000":
                res[0] = "4.06";
                res[1] = "心脏大血管外科专业";
                break;
            case "1300000":
                res[0] = "4.06";
                res[1] = "心脏大血管外科专业";
                break;
            case "1040000":
                res[0] = "5";
                res[1] = "妇产科";
                break;
            case "1050000":
                res[0] = "7";
                res[1] = "儿科";
                break;
            case "1510000":
                res[0] = "8";
                res[1] = "小儿外科";
                break;
            case "1090000":
                res[0] = "10";
                res[1] = "眼科";
                break;
            case "1100000":
                res[0] = "11";
                res[1] = "耳鼻咽喉科";
                break;
            case "1110000":
                res[0] = "12";
                res[1] = "口腔科";
                break;
            case "1160000":
                res[0] = "13";
                res[1] = "皮肤科";
                break;
            case "1230000":
                res[0] = "14";
                res[1] = "医疗美容科";
                break;
            case "1000002":
                res[0] = "15";
                res[1] = "精神科";
                break;
            case "3150000":
                res[0] = "16";
                res[1] = "传染科";
                break;
            case "1200000":
                res[0] = "19";
                res[1] = "肿瘤科";
                break;
            case "1190006":
                res[0] = "20";
                res[1] = "急诊医学科";
                break;
            case "1190007":
                res[0] = "20";
                res[1] = "急诊医学科";
                break;
            case "1280000":
                res[0] = "21";
                res[1] = "康复医学科";
                break;
            case "1130100":
                res[0] = "26";
                res[1] = "麻醉科";
                break;
            case "1130400":
                res[0] = "27";
                res[1] = "疼痛科";
                break;
            case "1400400":
                res[0] = "28";
                res[1] = "重症医学科";
                break;
            case "2070000":
                res[0] = "31";
                res[1] = "病理科";
                break;
            case "1020600":
                res[0] = "32.09";
                res[1] = "介入放射学专业";
                break;
            case "1240000":
                res[0] = "32.1";
                res[1] = "放射治疗专业";
                break;
            case "1080000":
                res[0] = "50";
                res[1] = "中医科";
                break;
            case "1060000":
                res[0] = "50.12";
                res[1] = "老年病科专业";
                break;
            default:
                res[0] = "1";
                res[1] = "预防保健科";
            }
        }
        return  res;
    }

+ 5 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyOutpatientVO.java

@ -207,6 +207,11 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
    @ApiModelProperty(value = "1.在线复诊2.协同门诊", example = "模块1")
    private String outpatientType;
    @ApiModelProperty(value = "医嘱", example = "模块1")
    private String advice;
    public String getAdmNo() {
        return admNo;
    }

+ 4 - 0
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/web/quota/JobController.java

@ -405,6 +405,10 @@ public class JobController extends BaseController {
                    //语句
                    ykyyInternetService.upNsDoctorRecord(null,null,null);
                    break; //可选
                case "2.5" :
                    //语句
                    ykyyInternetService.upNsDoctorRecord(null,null,null);
                    break; //可选
                case "2.8" :
                    //语句
                    ykyyInternetService.upNsOnlineAsk(null,null,null);

+ 1 - 1
svr/svr-internet-hospital-job/src/main/resources/bootstrap.yml

@ -1,6 +1,6 @@
spring:
  application:
    name: svr-internet-hospital-job-yx
    name: svr-internet-hospital-job
  cloud:
    config:
      failFast: true