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

@@ -327,7 +327,7 @@ public class PrescriptionInfoService extends BaseService {
     * @param code
     * @return
     */
    public int cancelPrescriotion(String code,String reason){
    public int cancelPrescriotion(String code,String reason)throws Exception{
        Prescription p = prescriptionDao.findByCode(code);
        p.setStatus(PrescriptionLog.PrescriptionLogStatus.patient_canel.getValue());
        p.setCancelReason(reason);
@@ -349,7 +349,7 @@ public class PrescriptionInfoService extends BaseService {
        prescriptionLogDao.save(log);
        //同步智业接口
        //upLoadPrescriotionState();
        jwPrescriptionService.fadeRecipe(code);
        return 1;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionInfoController.java

@@ -99,7 +99,7 @@ public class PatientPrescriptionInfoController extends BaseController {
            return write(200, "查询成功！", "data", prescriptionInfoService.cancelPrescriotion(code,reason));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
            return error(-1, "取消失败！");
        }
    }