Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionLog.java

@@ -24,12 +24,24 @@ public class PrescriptionLog extends IdEntity {
        static public Integer expressage = 6;   //配送
        static public Integer finish = 7;   //已完成
    }
    public final static class PrescriptionLogStatus {
        static public Integer no_reviewed =-1; //审核不通过
        static public Integer revieweding = 0;  //审核中
        static public Integer reviewed_success = 10;   //审核通过/待支付
        static public Integer pay_success = 20;  //支付成功/配药中
        static public Integer pay_error  = 21;    //21支付失败
        static public Integer wait_expressage = 30;   //配药成功/等待领药
        static public Integer expressageing = 31;   //配送中
        static public Integer expressageing_error = 32;   //配送失败
        static public Integer finish = 100;   //结束
    }
    private String code;                    //业务流程
    private String prescriptionCode;      //处方code 关联表wlyy_prescription code
    private Date createTime;               //处方创建时间
    private Integer status;                  //状态 (-1 审核不通过 , 0 审核中, 10 审核通过/待支付 ,21支付失败  20 配药中/支付成功, 21 等待领药 ,30 配送中 ,100配送成功/已完成)
    private Integer type;                //类型: 1智业对接 2易联众对接  3创建处方 4 审核  5付款 6 配送 7完成
    private Integer status;                  //状态 (-1 审核不通过 , 0 审核中, 10 审核通过/待支付 ,20 配药中/支付成功  , 21支付失败  , 30 配药成功/等待领药 ,31 配送中 32 配送失败,100配送成功/已完成)
    private Integer type;                   //类型: 1智业对接 2易联众对接  3创建处方 4 审核  5付款 6 配送 7完成
    private String userCode;                  //医生或者患者code
    private String userName;                  //医生或者患者name
    private Integer userType;                 //1 患者 2医生

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

@@ -58,7 +58,7 @@ public class PrescriptionExpressageService {
            prescriptionLog.setFlag(1);
            prescriptionLog.setUserCode(userCode);
            prescriptionLog.setUserType(2);
            prescriptionLog.setType(42);
            prescriptionLog.setStatus(PrescriptionLog.PrescriptionLogStatus.expressageing_error);
            prescriptionLog.setRemark("配送失败，处方编码不存在");
            prescriptionLogDao.save(prescriptionLog);
            return -1;
@@ -74,7 +74,7 @@ public class PrescriptionExpressageService {
            prescriptionLog.setFlag(1);
            prescriptionLog.setUserCode(userCode);
            prescriptionLog.setUserType(2);
            prescriptionLog.setType(42);
            prescriptionLog.setStatus(PrescriptionLog.PrescriptionLogStatus.expressageing_error);
            prescriptionLog.setRemark("配送失败，处方编码不是取药码");
            prescriptionLogDao.save(prescriptionLog);
            return -1;
@@ -87,12 +87,12 @@ public class PrescriptionExpressageService {
        PrescriptionLog prescriptionLog = new PrescriptionLog();
        prescriptionLog.setPrescriptionCode(prescriptionDispensaryCode.getPrescriptionCode());
        prescriptionLog.setCode(UUID.randomUUID().toString());
        prescriptionLog.setType(PrescriptionLog.PrescriptionLogType.expressage);
        prescriptionLog.setType(PrescriptionLog.PrescriptionLogType.finish);
        prescriptionLog.setCreateTime(new Date());
        prescriptionLog.setFlag(1);
        prescriptionLog.setUserCode(userCode);
        prescriptionLog.setUserType(2);
        prescriptionLog.setType(100);
        prescriptionLog.setStatus(PrescriptionLog.PrescriptionLogStatus.finish);
        prescriptionLogDao.save(prescriptionLog);
        //修改取药码code为已经使用