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

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

@@ -779,6 +779,11 @@ public class PrescriptionInfoService extends BaseService {
        }
    }
    /**
     * 获取订单跟踪下拉列表
     * @param doctor
     * @return
     */
    public JSONObject getPrescriptionExpressageFilter(String doctor) {
        JSONObject rs = new JSONObject();
@@ -805,7 +810,7 @@ public class PrescriptionInfoService extends BaseService {
        states.add(map4);
        Map<String, Object> map5 = new HashMap<>();
        map2.put("name", "配药完成");
        map2.put("name", "已完成");
        map2.put("code", PrescriptionLog.PrescriptionLogStatus.finish.getValue());
        states.add(map2);
        //设置配送状态下拉框