浏览代码

删除PC版本的项目

chenweida 7 年之前
父节点
当前提交
b08dd4cb04

+ 42 - 6
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/patient/prescription/Prescription.java

@ -342,30 +342,66 @@ public class Prescription extends IdEntity {
        }
        return "";
    }
    @Transient
    public String getStatusName() {
        /**
         *  no_reviewed("审核不通过", -1),
         revieweding("待审核", 0),
         changeing("调整中",2),
         reviewed_success("审核通过/开方中", 10),
         wait_pay("开方完成/待支付", 20),
         pay_error("支付失败", 21),
         pay_success("支付成功/待配药", 30),
         wait_expressage("配药成功/待配送", 40),
         expressageing_error("配送失败", 41),
         expressageJGS("分配健管师", 42),
         expressageing("配送中", 45),
         expressage2hospital("配送到服务站", 49),
         finish("配送到患者手中/已完成", 100);
         */
        //-1 审核不通过 , 0 审核中, 10 审核通过/待支付 ,21支付失败  20 配药中/支付成功, 21 等待领药 ,30 配送中 ,100配送成功/已完成
        switch (status) {
            case -1: {
                return "审核不通过";
            }
            case 0: {
                return "审核中";
                return "待审核";
            }
            case 2: {
                return "调整处方中";
            }
            case 10: {
                return "待支付";
                return "开方中";
            }
            case 20: {
                return "订单已支付";
                return "开方完成";
            }
            case 21: {
                return "配药完成";
                return "支付失败";
            }
            case 30: {
                return "配送中";
                return "订单已支付";
            }
            case 40: {
                return "配药成功待配送";
            }
            case 41: {
                return "配送失败";
            }
            case 42: {
                return "分配健管师配送";
            }
            case 45: {
                return "订单配送中";
            }
            case 49: {
                return "配送到服务站";
            }
            case 100: {
                return "续方完成";
                return "订单完成";
            }
        }
        return "";

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

@ -6,6 +6,7 @@ import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
@ -89,6 +90,8 @@ public class PrescriptionLog extends IdEntity {
        public void setValue(int value) {
            this.value = value;
        }
    }
    private String code;                    //业务流程

+ 1 - 1
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@ -182,7 +182,7 @@ public class PrescriptionInfoController extends BaseController {
            jo.put("dispensaryDispensaryType", prescription.getType());//处方配送方式
            jo.put("dispensaryDispensaryTypeName", prescription.getTypeName());//处方配送方式
            jo.put("prescriptionStatus", prescription.getStatus());//处方状态
            jo.put("prescriptionStatusName", prescription.getStatus());//处方状态
            jo.put("prescriptionStatusName", prescription.getStatusName());//处方名称
            return write(200, "查询成功", "data", jo);
        } catch (Exception e) {