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

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

@@ -14,7 +14,16 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_prescription_log")
public class PrescriptionLog extends IdEntity{
public class PrescriptionLog extends IdEntity {
    public final static class PrescriptionLogType {
        static public Integer zy = 1; //智业对接
        static public Integer ylz = 2;  //易联众对接
        static public Integer create = 3;   //创建处方
        static public Integer reviewed  = 4;    //审核
        static public Integer pay = 5;  //支付
        static public Integer expressage = 6;   //配送
        static public Integer finish = 7;   //已完成
    }
    private String code;                    //业务流程
    private String prescriptionCode;      //处方code 关联表wlyy_prescription code

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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.Map;
import java.util.UUID;
/**
@@ -37,6 +38,7 @@ public class PrescriptionExpressageService {
        return prescriptionExpressageDao.findByPrescriptionPay(prescriptionCode);
    }
    /**
     * 确认配送成功
     *
@@ -52,6 +54,7 @@ public class PrescriptionExpressageService {
            prescriptionLog.setCode(UUID.randomUUID().toString());
            prescriptionLog.setPrescriptionCode(prescriptionDispensaryCode.getPrescriptionCode());
            prescriptionLog.setCreateTime(new Date());
            prescriptionLog.setType(PrescriptionLog.PrescriptionLogType.expressage);
            prescriptionLog.setFlag(1);
            prescriptionLog.setUserCode(userCode);
            prescriptionLog.setUserType(2);
@@ -67,6 +70,7 @@ public class PrescriptionExpressageService {
        PrescriptionLog prescriptionLog = new PrescriptionLog();
        prescriptionLog.setPrescriptionCode(prescriptionDispensaryCode.getPrescriptionCode());
        prescriptionLog.setCode(UUID.randomUUID().toString());
        prescriptionLog.setType(PrescriptionLog.PrescriptionLogType.expressage);
        prescriptionLog.setCreateTime(new Date());
        prescriptionLog.setFlag(1);
        prescriptionLog.setUserCode(userCode);