Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionExpressageLog.java

@@ -18,11 +18,20 @@ public class PrescriptionExpressageLog extends IdEntity{
    private String code;                    //业务code
    private String prescriptionCode;      //处方code  关联表wlyy_prescription code
    private String expressageCode;//配送code 关联wlyy_prescription_expressage code
    private String expressageCode; //配送code 关联wlyy_prescription_expressage code
    private Date createTime;                //创建的时间
    private String remark;//备注
    //健管师配送时候填写字段
    //配送人
    private String expressageHospitalName;            // 如果配送方式是健管师那么这个字段存服务站名称，如果是快递配送那么是快递公司名称
    private String expressageHospitalAddress;         // 配送机构地址
    private String expressageHospitalCode;            //配送机构code
    private String expressageUserName;          //配送人名称
    private String expressageUserCode;          //配送人code
    private String expressageUserMobile;        //配送人电话
    private Date   expressageTime;                //开始配送的时间
    //接收人
    private String acceptHospital;// /健管师配送 接收机构
    private String acceptHospitalName;///健管师配送 接收机构名称
    private String acceptUser;///健管师配送 接收人
@@ -152,5 +161,59 @@ public class PrescriptionExpressageLog extends IdEntity{
        this.acceptUserMobile = acceptUserMobile;
    }
    public String getExpressageHospitalName() {
        return expressageHospitalName;
    }
    public void setExpressageHospitalName(String expressageHospitalName) {
        this.expressageHospitalName = expressageHospitalName;
    }
    public String getExpressageHospitalAddress() {
        return expressageHospitalAddress;
    }
    public void setExpressageHospitalAddress(String expressageHospitalAddress) {
        this.expressageHospitalAddress = expressageHospitalAddress;
    }
    public String getExpressageHospitalCode() {
        return expressageHospitalCode;
    }
    public void setExpressageHospitalCode(String expressageHospitalCode) {
        this.expressageHospitalCode = expressageHospitalCode;
    }
    public String getExpressageUserName() {
        return expressageUserName;
    }
    public void setExpressageUserName(String expressageUserName) {
        this.expressageUserName = expressageUserName;
    }
    public String getExpressageUserCode() {
        return expressageUserCode;
    }
    public void setExpressageUserCode(String expressageUserCode) {
        this.expressageUserCode = expressageUserCode;
    }
    public String getExpressageUserMobile() {
        return expressageUserMobile;
    }
    public void setExpressageUserMobile(String expressageUserMobile) {
        this.expressageUserMobile = expressageUserMobile;
    }
    public Date getExpressageTime() {
        return expressageTime;
    }
    public void setExpressageTime(Date expressageTime) {
        this.expressageTime = expressageTime;
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/controller/medicine/PhysicalExaminationController.java

@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
@CrossOrigin
@RestController
@RequestMapping(value = "/medicine/physicalExamination")
public class PhysicalExaminationController extends BaseController {
@@ -50,7 +51,6 @@ public class PhysicalExaminationController extends BaseController {
    @Autowired
    private ExamReportService examReportService;
    @ApiOperation(value = "获取试卷列表")
    @RequestMapping(value = "/findExames",produces="application/json;charset=UTF-8")
    @ResponseBody

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/config/SpringSecurityConfig.java

@@ -29,6 +29,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
                "/common/**",
                "/login/**",
                "/yueren/**",
                "/customer/**",
                "/admin/hos/doctor/importFromExcel",
                "/admin/hos/doctor/importData",
                "/admin/team/importData",

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/common/account/CustomerController.java

@@ -74,7 +74,7 @@ public class CustomerController extends BaseController {
            wlyyCustomerLog.setUser(curUser.getCode());
            wlyyCustomerLog.setType(1);
            wlyyCustomerLogService.save(wlyyCustomerLog);
            return write(1,"登入成功","user",curUser);
            return write(200,"登入成功","user",curUser);
        }
    }
@@ -92,7 +92,7 @@ public class CustomerController extends BaseController {
        wlyyCustomerLog.setUser(code);
        wlyyCustomerLog.setType(0);
        wlyyCustomerLogService.save(wlyyCustomerLog);
        return write(1,"退出成功");
        return write(200,"退出成功");
    }
    /**
@@ -126,7 +126,7 @@ public class CustomerController extends BaseController {
        }
        Map<String, Object> resp = customerService.findServerInfo(patient);
        resp.put("patient",patient);
        return write(1,"查询成功","data",resp);
        return write(200,"查询成功","data",resp);
    }
    /**
@@ -144,6 +144,6 @@ public class CustomerController extends BaseController {
        }
        Map<String, Object> resp = customerService.findServerInfo(patient);
        resp.put("patient",patient);
        return write(1,"查询成功","data",resp);
        return write(200,"查询成功","data",resp);
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/event/ApplicationEvent.java

@@ -75,6 +75,8 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
            } else {
                logger.info("sfexpress reorder job job exist");
            }
            //同步智业字典 每晚1点同步
            if (!quartzHelper.isExistJob("zy_dict_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("zy_dict_job");
@@ -84,6 +86,15 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("zy_dict_job job exist");
            }
            //遍历支付成功，院内结算失败的的记录，重新结算，10分钟跑一次
            if (!quartzHelper.isExistJob("zy_execute_sick_settle_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("zy_execute_sick_settle_job");
                quartzHelper.addJob(PrescriptionExecuteSickSettleJob.class, trigger, "zy_execute_sick_settle_job", new HashMap<String, Object>());
                logger.info("zy_execute_sick_settle_job reorder job job success");
            } else {
                logger.info("zy_execute_sick_settle_job reorder job job exist");
            }
        } catch (Exception e) {
            logger.info("sign end job start failed");

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/job/PrescriptionExecuteSickSettleJob.java

@@ -40,6 +40,7 @@ public class PrescriptionExecuteSickSettleJob implements Job {
                        jwPrescriptionService.executeSickSettle(code);
                    }catch (Exception e){
                        logger.info("ERROR======重新执行院内结算的JOB,CODE:"+code+",message:" +e.getMessage());
                        continue;
                    }
                }
            }

patient-co/patient-co-wlyy-job/src/main/resources/system.properties

@@ -87,6 +87,10 @@ sfexpress_reorder_job=0 0/10 * * * ?
#同步智业字典
zy_dict_job=0 0 1 * * ?
#遍历支付成功，院内结算失败的的记录，重新结算，10分钟跑一次
zy_execute_sick_settle_job=0 0/10 * * * ?
#统一支付平台支付成功后页面跳转地址
return_url={server}/wx/html/qygl/html/pay_result.html
#统一支付平台支付接口地址

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/prescription/PrescriptionDispensaryCodeDao.java

@@ -30,5 +30,13 @@ public interface PrescriptionDispensaryCodeDao extends PagingAndSortingRepositor
//    @Query("select p1 from PrescriptionInfo p1 left join Prescription p2 on p1.prescriptionCode=p2.code where p1.prescriptionCode = ?1")
//    List<PrescriptionInfo> getPrescriptionInfo(String prescriptionCode);
    /**
     * 更新处方某一类型的编码为使用
     * @param prescriptionCode
     * @param type
     */
    @Query(" update PrescriptionDispensaryCode a set a.isUse=1 where a.prescriptionCode= ?1 and a.type =?2 and a.isUse=0")
    void updateToUse(String prescriptionCode, Integer type);
    PrescriptionDispensaryCode findByCodeAndIsUse(String code, Integer isUse);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionExpressageService.java

@@ -118,7 +118,7 @@ public class PrescriptionExpressageService {
            }
            case 3: {
                //判断是3 配送员（健管师）配送码
                returnStatus = dispensaryCode_3(userCode, prescriptionDispensaryCode);
                // returnStatus = dispensaryCode_3(userCode, prescriptionDispensaryCode);
                break;
            }
            default: {
@@ -217,15 +217,17 @@ public class PrescriptionExpressageService {
    /**
     * 配送员（健管师）配送码
     *
     *  没用的代码
     * @param userCode
     * @param prescriptionDispensaryCode
     * @return
     */
    @Deprecated
    private Integer dispensaryCode_3(String userCode, PrescriptionDispensaryCode prescriptionDispensaryCode) throws Exception {
        //获取配送的医生信息
        Doctor doctor = doctorDao.findByCode(userCode);
        //判断是不是最终的服务站
        //修改处方状态为配送到服务站
        Prescription prescription = prescriptionDao.findByCode(prescriptionDispensaryCode.getPrescriptionCode());
        Date expressage2hospitalDate = new Date();
@@ -325,14 +327,19 @@ public class PrescriptionExpressageService {
        prescriptionLogDao.save(prescriptionLog);
        //提醒健管师待取药
        prescriptionService.waitExpressageMessage(prescriptionCode,code);
        prescriptionService.waitExpressageMessage(prescriptionCode, code);
    }
    @Transactional
    public void expressage2Hospital(String hospital, String hospitalName, String hospitalAddress, String userCode, String userName, String mobile, String prescriptionCode) {
        PrescriptionExpressage prescriptionExpressage = prescriptionExpressageDao.findByPrescriptionCode(prescriptionCode);
        //添加配送日志
        PrescriptionExpressageLog prescriptionExpressageLog = new PrescriptionExpressageLog();
        prescriptionExpressageLog.setCreateTime(new Date());
        prescriptionExpressageLog.setCode(UUID.randomUUID().toString());
        prescriptionExpressageLog.setPrescriptionCode(prescriptionCode);
        //设置接收人
        prescriptionExpressageLog.setAcceptAddress(hospitalAddress);
        prescriptionExpressageLog.setAcceptHospital(hospital);
        prescriptionExpressageLog.setAcceptHospitalName(hospitalName);
@@ -340,28 +347,49 @@ public class PrescriptionExpressageService {
        prescriptionExpressageLog.setAcceptUser(userCode);
        prescriptionExpressageLog.setAcceptUserName(userName);
        prescriptionExpressageLog.setAcceptUserMobile(mobile);
        prescriptionExpressageLog.setCreateTime(new Date());
        prescriptionExpressageLog.setCode(UUID.randomUUID().toString());
        prescriptionExpressageLog.setPrescriptionCode(prescriptionCode);
        //设置配送人
        prescriptionExpressageLog.setExpressageCode(prescriptionExpressage.getCode());
        prescriptionExpressageLog.setExpressageHospitalAddress(prescriptionExpressage.getExpressageHospitalAddress());
        prescriptionExpressageLog.setExpressageHospitalCode(prescriptionExpressage.getExpressageHospitalCode());
        prescriptionExpressageLog.setExpressageHospitalName(prescriptionExpressage.getExpressageHospitalName());
        prescriptionExpressageLog.setExpressageTime(prescriptionExpressage.getExpressageTime());
        prescriptionExpressageLog.setExpressageUserCode(prescriptionExpressage.getExpressageCode());
        prescriptionExpressageLog.setExpressageUserMobile(prescriptionExpressage.getExpressageMobile());
        prescriptionExpressageLog.setExpressageUserName(prescriptionExpressage.getExpressageName());
        prescriptionExpressageLogDao.save(prescriptionExpressageLog);
        //更新配送表，接收药品信息
        prescriptionExpressage.setAcceptCode(userCode);
        prescriptionExpressage.setAcceptName(userName);
        prescriptionExpressage.setAcceptMobile(mobile);
        prescriptionExpressage.setAcceptHospital(hospital);
        prescriptionExpressage.setAcceptHospitalName(hospitalName);
        prescriptionExpressage.setAcceptHospitalAddress(hospitalAddress);
        prescriptionExpressage.setAcceptTime(new Date());
        /**
         * 判断如果服务站和患者填写的服务站一致  那么就修改处方状态为送达服务站
         * 判断如果服务站和患者填写的服务站一致
         */
        if (hospital.equals(prescriptionExpressage.getPatientHospitalCode())) {
            // 如果是最后服务站
            //设置配送码失效
            prescriptionDispensaryCodeDao.updateToUse(prescriptionCode,3);
            //修改处方是配送完成
            Prescription prescription = prescriptionDao.findByCode(prescriptionCode);
            prescription.setStatus(PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue());
            prescription.setExpressageTime(new Date());
            prescriptionExpressage.setAcceptCode(userCode);
            prescriptionExpressage.setAcceptName(userName);
            prescriptionExpressage.setAcceptMobile(mobile);
            prescriptionExpressage.setAcceptHospital(hospital);
            prescriptionExpressage.setAcceptHospitalName(hospitalName);
            prescriptionExpressage.setAcceptHospitalAddress(hospitalAddress);
            prescriptionExpressage.setAcceptTime(new Date());
        }else{
            //如果不是重点服务站,更新配送表，更新配送信息是当前登陆人
            prescriptionExpressage.setExpressageCode(userCode);
            prescriptionExpressage.setExpressageName(userName);
            prescriptionExpressage.setExpressageMobile(mobile);
            prescriptionExpressage.setExpressageHospitalCode(hospital);
            prescriptionExpressage.setExpressageHospitalName(hospitalName);
            prescriptionExpressage.setExpressageHospitalAddress(hospitalAddress);
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionLogController.java

@@ -100,8 +100,8 @@ public class PrescriptionLogController extends BaseController {
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getAcceptUser());
                prescriptionLog.setUserName(prescriptionExpressageLog.getAcceptUserName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getExpressageUserCode());
                prescriptionLog.setUserName(prescriptionExpressageLog.getExpressageUserName());
                prescriptionLogs.add(prescriptionLog);
            }
            //排序

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/express/SFExpressApiController.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.web.express;
package com.yihu.wlyy.web.gateway.controller.express;
import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.service.app.express.SFExpressService;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionLogController.java

@@ -65,8 +65,8 @@ public class PatientPrescriptionLogController extends BaseController {
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getAcceptUser());
                prescriptionLog.setUserName(prescriptionExpressageLog.getAcceptUserName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getExpressageUserCode());
                prescriptionLog.setUserName(prescriptionExpressageLog.getExpressageUserName());
                prescriptionLogs.add(prescriptionLog);
            }