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

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

@@ -401,10 +401,10 @@ public class Prescription extends IdEntity {
            case 4: {
                return "调整失败";
            }
            case 5: {
            case 21: {
                return "药师审核失败";
            }
            case 6: {
            case 31: {
                return "开方失败";
            }
            case 10: {

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

@@ -64,15 +64,15 @@ public class PrescriptionLog extends IdEntity {
        changeing("调整中", 2),
        change_success("调整成功",3),
        change_error("调整失败",4),
        Pharmacist_examination_error("药师审核失败",5),
        add_error("开方失败",6),
        reviewed_success(" 医生审核(CA)通过", 10),
        //药师审核中
        Pharmacist_examination("药师审核中",20),
        Pharmacist_examination_error("药师审核失败",21),
        //开方中/药师审核成功
        adding("开方中/药师审核成功",30),
        add_error("开方失败",31),
        //待支付
        wait_pay("开方完成/待支付", 40),

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

@@ -471,7 +471,7 @@ public class PrescriptionInfoService extends BaseService {
                jdbcTemplate.execute(sql2.toString());
                JSONArray array = new  JSONArray(diagnosis);
                Iterator<Object> itds = jsonArray.iterator();
                Iterator<Object> itds = array.iterator();
                while (itds.hasNext()){
                    JSONObject info = (JSONObject) itds.next();
                    PrescriptionDiagnosis p = new PrescriptionDiagnosis();