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

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

@@ -671,8 +671,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                //取药类型:1 自取 2快递配送
                sql = "UPDATE base.wlyy_prescription p SET p.`status`='100',p.pay_status='1' WHERE p.adm_no='" + admNo + "' AND p.real_order='" + realOrder + "' ";
                //变更门诊状态
                outPatientSql = "UPDATE base.wlyy_outpatient p SET p.`status`='2' WHERE p.adm_no='" + admNo + "'";
                jdbcTemplate.execute(outPatientSql);
//                outPatientSql = "UPDATE base.wlyy_outpatient p SET p.`status`='2' WHERE p.adm_no='" + admNo + "'";
//                jdbcTemplate.execute(outPatientSql);d
            } else {
                //取药类型:1 自取 2快递配送
                sql = "UPDATE base.wlyy_prescription p SET p.`status`='32',p.pay_status='1' WHERE p.adm_no='" + admNo + "' AND p.real_order='" + realOrder + "' ";

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

@@ -24,6 +24,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service
public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpErrorLogDao> {
@@ -417,31 +418,50 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        int success = 0;
        int error = 0;
        List<MedicalSkillOrdersDO> medicalSkillOrdersDOs= medicalSkillOrdersDao.findMedicalSkillOrdersByAppTime(startDate,endDate);
        if(medicalSkillOrdersDOs != null && medicalSkillOrdersDOs.size() > 0){
            total = medicalSkillOrdersDOs.size();
            for(MedicalSkillOrdersDO medicalSkillOrdersDO :medicalSkillOrdersDOs ){
                String[] dept = depToSubject(medicalSkillOrdersDO.getAppDepCode().toString());
                String docInterId = achNsDoctorRecord(medicalSkillOrdersDO.getIdDoctor());
        String sql ="SELECT " +
                " i.id, " +
                " i.`code`, " +
                " i.dept, " +
                " o.doctor, " +
                " o.register_date " +
                " i.create_time, " +
                " p.`name`, " +
                " p.idcard, " +
                " 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 " +
                "WHERE " +
                " i.create_time >='"+startDate+"' " +
                " and i.create_time <='"+endDate+"'";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
//        List<MedicalSkillOrdersDO> medicalSkillOrdersDOs= medicalSkillOrdersDao.findMedicalSkillOrdersByAppTime(startDate,endDate);
        if(list != null && list.size() > 0){
            total = list.size();
            for(Map<String,Object> ins :list ){
                String[] dept = depToSubject(ins.get("dept").toString());
                String docInterId = achNsDoctorRecord(ins.get("doctor").toString());
                JSONObject jb = new JSONObject();
                jb.put("id",orgCode + medicalSkillOrdersDO.getId());
                jb.put("id",orgCode + ins.get("id").toString());
                jb.put("cd_org", orgCode);
                jb.put("cd_area", orgArea);
                jb.put("cd_orgSub", orgSub);
                jb.put("app_time",medicalSkillOrdersDO.getAppTime().toString());
                jb.put("app_time",DateUtil.dateToStr(new Date((Long)ins.get("register_date")),"YYYY-MM-DD HH:mm:SS"));
                jb.put("app_dep_code", dept[0].toString());
                jb.put("app_class_code", medicalSkillOrdersDO.getAppClassCode());
                jb.put("app_class_code", ins.get(""));
                jb.put("id_doctor", docInterId);
                jb.put("fg_handle", medicalSkillOrdersDO.getFgHandle());
                jb.put("handle_time", medicalSkillOrdersDO.getHandleTime());
                jb.put("pt_name", medicalSkillOrdersDO.getPtName());
                jb.put("ge_code", medicalSkillOrdersDO.getGeCode());
                jb.put("card_type", "1");
                jb.put("id_no", medicalSkillOrdersDO.getIdNo());
                jb.put("pt_tel", medicalSkillOrdersDO.getPtTel());
//                jb.put("fg_handle", medicalSkillOrdersDO.getFgHandle());
//                jb.put("handle_time", medicalSkillOrdersDO.getHandleTime());
//                jb.put("pt_name", medicalSkillOrdersDO.getPtName());
//                jb.put("ge_code", medicalSkillOrdersDO.getGeCode());
//                jb.put("card_type", "1");
//                jb.put("id_no", medicalSkillOrdersDO.getIdNo());
//                jb.put("pt_tel", medicalSkillOrdersDO.getPtTel());
                jb.put("crt_date",DateUtil.dateToStrLong(DateUtil.getNow()));
                JSONArray jsonArray = new JSONArray();
@@ -452,7 +472,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                if("200".equals(resJson.get("msg").toString())){
                    success++;
                }else{
                    saveErrorLog("6",medicalSkillOrdersDO.getId().toString(),res);
//                    saveErrorLog("6",medicalSkillOrdersDO.getId().toString(),res);
                    error++;
                }
            }

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/InternetUpdateJob.java

@@ -38,7 +38,7 @@ public class InternetUpdateJob implements Job {
            logger.info("START========2.6 网上医技预约上传开始========");
            res = internetService.upMedicalOnline(startDate,endDate);
            logger.info("END==========2.5 网上医技预约上传结束========" + res);
            logger.info("END==========2.6 网上医技预约上传结束========" + res);
            logger.info("START========2.7 医生评价信息开始========");
            res = internetService.upNsDoctorScore(startDate,endDate);

svr/svr-internet-hospital-job/src/main/resources/system.properties

@@ -2,7 +2,7 @@
# 健康频道状态
prescriptionStatus_update_job=0 */2 * * * ?
# 门诊记录过期job
# 门诊记录过期job，每天1 点触发
prescription_overdue_job=0 0 1 * * ?
#每天1 点触发