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

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

@@ -0,0 +1,248 @@
package com.yihu.jw.internet.service;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
import com.yihu.jw.hospital.prescription.dao.*;
import com.yihu.jw.internet.dao.IntUpErrorLogDao;
import com.yihu.jw.internet.entity.InternetUpErrorLogDO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionInfoVO;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
/**
 * Created by Trick on 2019/10/25.
 */
@Service
@Transactional
public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, IntUpErrorLogDao> {
    @Autowired
    private OutpatientDao outpatientDao;
    @Autowired
    private PrescriptionDao prescriptionDao;
    @Autowired
    private PrescriptionInfoDao prescriptionInfoDao;
    @Autowired
    private WlyyInspectionDao wlyyInspectionDao;
    @Autowired
    private PatientRegisterDao patientRegisterDao;
    @Autowired
    private PatientMappingDao patientMappingDao;
    @Autowired
    private BaseDoctorDao baseDoctorDao;
    @Autowired
    private BaseDoctorHospitalDao baseDoctorHospitalDao;
    /**
     * 生成数据，测试监管平台数据上传
     * @param doctor 医生id
     * @param date 生成日期，“yyyy-MM-dd”
     * @return
     */
    public String setData(String doctor,String date){
        //居民门诊记录数据源
        Iterable<PatientMappingDO> patientMappingDOs = patientMappingDao.findAll();
        Iterator it = patientMappingDOs.iterator();
        //医生信息数据源
        BaseDoctorDO doctorDO = baseDoctorDao.findOne(doctor);
        //部门信息
        BaseDoctorHospitalDO hospitalDO = baseDoctorHospitalDao.findByDoctorCode(doctor).get(0);
        while (it.hasNext()){
            PatientMappingDO patientMappingDO = (PatientMappingDO)it.next();
            //1.生成门诊记录
            WlyyOutpatientDO wlyyOutpatientDO = getOutPatient(patientMappingDO,doctorDO,hospitalDO,date);
            //2.生成处方记录
            WlyyPrescriptionDO prescriptionDO = getPrescription(wlyyOutpatientDO,date);
            //3.生成药品
            getPreInfo(prescriptionDO,date);
            //4.生成检查检验
            getInspection(prescriptionDO,date);
            //5.门诊预约
            getRegisterDO(wlyyOutpatientDO,date);
        }
        return "success";
    }
    /**
     * 生成门诊记录
     * @param date
     * @return
     */
    public WlyyOutpatientDO getOutPatient(PatientMappingDO patientDO,BaseDoctorDO doctorDO,BaseDoctorHospitalDO hospitalDO,String date){
        WlyyOutpatientDO outpatientDO = new WlyyOutpatientDO();
        outpatientDO.setStatus("2");
        outpatientDO.setPatient(patientDO.getPatient());
        outpatientDO.setPatientName(patientDO.getPatientName());
        outpatientDO.setIdcard(patientDO.getIdcard());
        outpatientDO.setDoctor(doctorDO.getId());
        outpatientDO.setDoctorName(doctorDO.getName());
        outpatientDO.setDept(hospitalDO.getDeptCode());
        outpatientDO.setDeptName(hospitalDO.getDeptName());
        outpatientDO.setHospital(hospitalDO.getOrgCode());
        outpatientDO.setHospital(hospitalDO.getOrgName());
        outpatientDO.setCreateTime(DateUtil.strToDate(date+" 09:30:00"));
        outpatientDO.setAdmDate(DateUtil.strToDate(date+" 09:30:00"));
        outpatientDO.setEndTime(DateUtil.strToDate(date+" 11:30:00"));
        outpatientDO.setRegisterDate(DateUtil.strToDate(date+" 09:20:00"));
        outpatientDO.setType("1");
        outpatientDO.setMjz("mz");
        outpatientDO.setWinNo("6");
        outpatientDO.setIcd10("ZZGX71");
        outpatientDO.setIcd10Name("肝血瘀阻证");
        outpatientDO.setRegisterNo(getCode());
        outpatientDO.setConNo(getCode());
        return outpatientDao.save(outpatientDO);
    }
    public WlyyPrescriptionDO getPrescription(WlyyOutpatientDO outpatient,String date){
        WlyyPrescriptionDO prescriptionDO = new WlyyPrescriptionDO();
        prescriptionDO.setOutpatientId(outpatient.getId());
        prescriptionDO.setStatus(100);
        prescriptionDO.setPatientCode(outpatient.getPatient());
        prescriptionDO.setPatientName(outpatient.getPatientName());
        prescriptionDO.setIdcard(outpatient.getIdcard());
        prescriptionDO.setDept(outpatient.getDept());
        prescriptionDO.setDeptName(outpatient.getDeptName());
        prescriptionDO.setDoctor(outpatient.getDoctor());
        prescriptionDO.setDoctorName(outpatient.getDoctorName());
        prescriptionDO.setIdcard(outpatient.getIdcard());
        prescriptionDO.setHospital(outpatient.getHospital());
        prescriptionDO.setHospitalName(outpatient.getHospitalName());
        prescriptionDO.setType(1);
        prescriptionDO.setCreateTime(DateUtil.strToDate(date+" 10:00:00"));
        return prescriptionDao.save(prescriptionDO);
    }
    public WlyyPrescriptionInfoDO getPreInfo(WlyyPrescriptionDO prescriptionDO,String date){
        /**
         * INSERT INTO `base`.`wlyy_prescription_info`
         * (`id`, `prescription_id`, `drug_no`, `drug_name`,
         * `disp_deposite`, `dosage`, `quantity`, `unit`, `unit_name`,
         * `pack_unit`, `pack_unit_name`, `usage_code`, `usage_name`,
         * `supply_code`, `supply_name`, `days`, `frequency`, `serial`,
         * `group_no`, `specification`, `pack_retprice`, `herbal_count`,
         * `post_count`, `del`) VALUES
         * ('2c9081aa6dfbce6e016dfc634a15002d', '2c9081aa6dfbce6e016dfc6309ad001c',
         * '08269 ', '聚乙二醇干扰素a-2b注射液', NULL,
         * '1', '1', '03', '支', '03', '支', '6id',
         * '每日6次', '001', '口服', '1', '2', '01', '71',
         * '180ug 0.5ml/支', '824.0000', '', '', '1');
         */
        WlyyPrescriptionInfoDO info = new WlyyPrescriptionInfoDO();
        info.setPrescriptionId(prescriptionDO.getId());
        info.setDrugNo("08269");
        info.setDrugName("聚乙二醇干扰素a-2b注射液");
        info.setDispDeposite("");
        info.setDosage("1");
        info.setQuantity("1");
        info.setUnit("03");
        info.setUnitName("支");
        info.setPackUnit("03");
        info.setPackUnitName("支");
        info.setUsageCode("6id");
        info.setUsageName("每日6次");
        info.setSupplyCode("001");
        info.setSupplyName("口服");
        info.setDays("1");
        info.setFrequency("1");
        info.setSerial("01");
        info.setGroupNo("71");
        info.setSpecification("180ug 0.5ml/支");
        info.setPackRetprice(824.0000);
        info.setDel(1);
        return prescriptionInfoDao.save(info);
    }
    public WlyyInspectionDO getInspection(WlyyPrescriptionDO prescriptionDO,String date){
        /**
         * INSERT INTO `base`.`wlyy_inspection` (`id`, `outpatient_id`,
         * `prescription_id`, `code`, `name`, `parent_code`,
         * `parent_name`, `dept`, `dept_name`, `quantity`,
         * `frequency`, `group_name`, `information`,
         * `check_equip`, `check_part`, `check_part_name`,
         * `adresult`, `goal`, `opview`, `specimen_name`,
         * `specimen_num`, `ywjc_result`, `ywjc_date`, `blzd`,
         * `fixationfluid`, `checkbox`, `mzpg`, `sfzg`, `create_time`)
         * VALUES ('2c9081aa6dfbce6e016dfc634a22002f',
         * '2c9081aa6dfbce6e016dfc6064280015',
         * '2c9081aa6dfbce6e016dfc6309ad001c', '360225',
         * '尿乳糜定性检查', NULL, NULL, '2160000', '',
         * '1', '1', '31', '23', '2', '1',
         * '头颅', '312', '321', '', '', '', '',
         * '', '', '', '1', '0', '0', '2019-10-24 14:10:29');
         */
        WlyyInspectionDO inspectionDO = new WlyyInspectionDO();
        inspectionDO.setOutpatientId(prescriptionDO.getOutpatientId());
        inspectionDO.setPrescriptionId(prescriptionDO.getId());
        inspectionDO.setCode("360225");
        inspectionDO.setName("尿乳糜定性检查");
        inspectionDO.setDept("2160000");
        inspectionDO.setDeptName("检验科");
        inspectionDO.setQuantity(1);
        inspectionDO.setFrequency("1");
        inspectionDO.setGroupName("31");
        inspectionDO.setInformation("23");
        inspectionDO.setCheckEquip("2");
        inspectionDO.setCheckPart("1");
        inspectionDO.setCheckPartName("头颅");
        inspectionDO.setAdresult("312");
        inspectionDO.setGoal("321");
        inspectionDO.setSfzg("0");
        inspectionDO.setMzpg("0");
        inspectionDO.setCheckbox("1");
        inspectionDO.setCreateTime(DateUtil.strToDate(date+"09:30:00"));
        return wlyyInspectionDao.save(inspectionDO);
    }
    public WlyyPatientRegisterDO getRegisterDO(WlyyOutpatientDO outpatient,String date){
        WlyyPatientRegisterDO registerDO = new WlyyPatientRegisterDO();
        registerDO.setPatient(outpatient.getPatient());
        registerDO.setPatientName(outpatient.getPatientName());
        registerDO.setDept(outpatient.getDept());
        registerDO.setDeptName(outpatient.getDeptName());
        registerDO.setDoctor(outpatient.getDoctor());
        registerDO.setDoctorName(outpatient.getDoctorName());
        registerDO.setDate(date);
        registerDO.setRegisterNo(outpatient.getRegisterNo());
        registerDO.setConNo(outpatient.getConNo());
        registerDO.setCreateTime(DateUtil.strToDate(date+" 08:00:00"));
        return patientRegisterDao.save(registerDO);
    }
}

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

@@ -353,8 +353,14 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        jsonArray.add(jb);
        String token = upNsUserToken();
        String res = postToInter(token, api, jsonArray);
        return res;
        JSONObject rs = (JSONObject) JSONObject.parse(res);
        String msg = rs.getString("msg");
        if("200".equals(msg)){
            JSONArray reqContent = rs.getJSONArray("reqContent");
            JSONObject req = (JSONObject)reqContent.get(0);
            return req.getString("id");
        }
        return "";
    }
    // 5 网上预约挂号	micc.upAppointmentOnline  --- 完成
@@ -462,11 +468,13 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                " i.create_time, " +
                " p.`name`, " +
                " p.idcard, " +
                " d.doctorIdCard," +
                " p.mobile " +
                "FROM " +
                " wlyy_inspection i " +
                "JOIN wlyy_outpatient o ON o.id = i.outpatient_id  " +
                "JOIN base_patient p ON p.id = o.patient " +
                " JOIN wlyy_outpatient o ON o.id = i.outpatient_id  " +
                " JOIN base_patient p ON p.id = o.patient " +
                " JOIN base_doctor d ON p.id = o.doctor " +
                "WHERE " +
                " i.create_time >='"+startDate+"' " +
                " and i.create_time <='"+endDate+"'" +
@@ -484,7 +492,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                Boolean errorFlag = false;
                try {
                    String[] dept = depToSubject(ins.get("dept").toString());
                    String docInterId = achNsDoctorRecord(ins.get("doctor").toString());
                    String docInterId = achNsDoctorRecord((String)ins.get("doctorIdCard"));
                    jb.put("id",orgCode + (String)ins.get("id"));
                    jb.put("cd_org", orgCode);
                    jb.put("cd_area", orgArea);
@@ -634,7 +642,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        String sql = "select a.id,a.type,c.name as docName,c.idcard as docIdCard,c.id as docId\n" +
                "      ,b.patient,b.name as patientName,b.birthday,a.czrq,a.end_time\n" +
                "      ,a.symptoms,d.sex,d.phone,d.idcard as patIdCard,d.city_code, e.dept_code, e.dept_name\n" +
                "      ,a.symptoms,d.sex,d.mobile,d.idcard as patIdCard,d.city_code, e.dept_code, e.dept_name\n" +
                "  from wlyy_consult a \n" +
                "      ,wlyy_consult_team b\n" +
                "        LEFT JOIN base_doctor c on c.id = b.doctor\n" +
@@ -665,7 +673,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                //基于科室转换成国家诊疗科目代码
                String[] dept = depToSubject(info.get("dept_code").toString());
                // 获取监管平台唯一标识
                String visitDocCode = achNsDoctorRecord(info.get("docId").toString());
                String visitDocCode = achNsDoctorRecord((String)info.get("docIdCard"));
                jb.put("id_online_ask", (String)info.get("id"));
                jb.put("net_service_code", "1");
@@ -685,7 +693,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("cost_type", "");
                jb.put("pt_birthdate", info.get("birthday") == null? "":info.get("birthday").toString());
                jb.put("ge_code", info.get("sex")== null? "0":info.get("sex"));
                jb.put("pt_tel",info.get("phone") == null ? "0":info.get("phone"));
                jb.put("pt_tel",info.get("mobile") == null ? "0":info.get("mobile"));
                jb.put("card_type", "1");
                jb.put("id_no", info.get("patIdCard")== null? "0":info.get("patIdCard"));
                jb.put("pt_district",info.get("city_code") == null?"":info.get("city_code"));
@@ -707,6 +715,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
            if(!errorFlag){
                JSONArray jsonArray = new JSONArray();
                jsonArray.add(jb);
                String str = jb.toJSONString();
                res = postToInter(token,api, jsonArray);
                JSONObject resJson = (JSONObject) JSONObject.parse(res);
@@ -740,9 +749,9 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                "     , a.dept, a.dept_name, c.name as paName, c.idcard as paId, c.sex,c.mobile,a.create_time,b.charge_type\n" +
                "     ,a.register_date, a.end_time,a.icd10,a.icd10_name,a.origin_adm_no, a.description ,d.req_fee\n" +
                "  from wlyy_outpatient a \n" +
                "         left join base_doctor b on b.id = a.doctor\n" +
                "         left join wlyy_charge_dict d on d.charge_type = b.charge_type\n" +
                "         left join base_patient c on c.id = a.patient\n" +
                "         join base_doctor b on b.id = a.doctor\n" +
                "         join wlyy_charge_dict d on d.charge_type = b.charge_type\n" +
                "         join base_patient c on c.id = a.patient\n" +
                " where a.register_no != '' and a.dept is not null and a.dept != '' " +
                " and a.register_date is not null " ;
@@ -768,7 +777,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                //基于科室转换成国家诊疗科目代码
                String[] dept = depToSubject(info.get("dept").toString());
                // 获取监管平台唯一标识
                String visitDocCode = achNsDoctorRecord(info.get("docId").toString());
                String visitDocCode = achNsDoctorRecord((String)info.get("docIdCard"));
                jb.put("id_online_med", orgCode + info.get("register_no"));
                jb.put("net_service_code", "4");
@@ -968,19 +977,19 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        String sql = "select 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" +
                "      ,a.specification,a.pack_retprice,a.quantity,a.pack_retprice as drug_total_price\n" +
                "  from wlyy_prescription_info a \n" +
                "     LEFT JOIN wlyy_prescription b \n" +
                "             on b.id = a.prescription_id\n" +
                " where  a.dosage is not null";
                " where  a.dosage is not null and a.dosage <> '' ";
        if(StringUtils.isNotBlank(startDate)){
            sql =  sql + "   b.create_time >=  '" + startDate + "' ";
            sql =  sql + "  and b.create_time >=  '" + startDate + "' ";
        }
        if(StringUtils.isNotBlank(endDate)){
            sql =  sql +  "  and b.create_time < '" + endDate + "' ";
        }
        if(StringUtils.isNotBlank(keyId)){
            sql =  sql +  "  and a.id < '" + keyId + "' ";
            sql =  sql +  "  and a.id = '" + keyId + "' ";
        }
        List list = jdbcTemplate.queryForList(sql);

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

@@ -1,5 +1,6 @@
package com.yihu.jw.web.quota;
import com.yihu.jw.internet.service.DataGeneratorService;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.job.PrescriptionOverdueJob;
import com.yihu.jw.job.PrescriptionStatusUpdateJob;
@@ -37,6 +38,9 @@ public class JobController extends BaseController {
    @Autowired
    private InternetService internetService;
    @Autowired
    private DataGeneratorService dataGeneratorService;
    @Autowired
    public JobController(JobService jobService, QuartzHelper quartzHelper) {
        this.jobService = jobService;
@@ -227,6 +231,11 @@ public class JobController extends BaseController {
            String res = "";
            switch(taskId){
                case "2.2":
                    logger.info("START========2.2 医院基本信息========");
                    res =  internetService.upNsOrganBas();
                    logger.info("END==========2.2 医院基本信息 ========" + res);
                    break;
                case "2.3" :
                    // 2、分步执行需要JOB执行的服务
                    logger.info("START========2.3 医师基本信息========");
@@ -277,4 +286,15 @@ public class JobController extends BaseController {
        }
    }
    @RequestMapping(value = "/setData", method = RequestMethod.POST)
    @ApiOperation("生成数据")
    public String setData(String doctor,String date) {
        try {
            dataGeneratorService.setData(doctor,date);
            return write(200, "启动成功");
        } catch (Exception e) {
            error(e);
            return error(-1, "启动失败");
        }
    }
}