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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/booking/PatientBookingController.java

@@ -49,11 +49,13 @@ public class PatientBookingController extends WeixinBaseController{
    @ResponseBody
    @ApiOperation("取消挂号单")
    public String CancelOrder(@ApiParam(name = "orderId", value = "订单id", defaultValue = "48")
                              @RequestParam(value = "orderId", required = true) String orderId) {
                              @RequestParam(value = "orderId", required = true) String orderId,
                              @ApiParam(name = "ssc", value = "社保卡号", defaultValue = "48")
                              @RequestParam(value = "ssc", required = true) String ssc) {
        try {
            //获取订单信息
            PatientReservation obj = patientReservationService.findByCode(orderId);
            boolean re = jwSmjkService.CancelOrder(obj.getCode(),obj.getSsc());
            boolean re = jwSmjkService.CancelOrder(orderId,ssc);
//            if (obj != null) {
//                String type = obj.getType();
//                String code = obj.getCode();
@@ -66,6 +68,10 @@ public class PatientBookingController extends WeixinBaseController{
//            }
            if (re) {
                PatientReservation obj = patientReservationService.findByCode(orderId);
                if(obj==null){//不是在i健康预约
                    return write(200, "取消挂号单成功！");
                }
                //更新状态
                patientReservationService.patientCancelOrder(orderId,getRepUID());//"9aa5c557e06a4324911487a035195545"
//                patientReservationService.patientCancelOrder(orderId,getUID());//"9aa5c557e06a4324911487a035195545"

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/BookingController.java

@@ -714,7 +714,7 @@ public class BookingController extends WeixinBaseController {
//            Date threeMonthBefore = getMonthBefore(nowDate, 3);        //三个月历史记录
//            List<PatientReservation> list = guahaoXM.GetRegList(patient, sm.format(threeMonthBefore), sm.format(oneMonthAfter), threeMonthBefore, oneMonthAfter);
            String list = jwSmjkService.GetRegList(patient);
            return write(200, "获取患者预约信息列表成功！", "data", list);
            return list;
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }
@@ -732,7 +732,7 @@ public class BookingController extends WeixinBaseController {
        try {
//            PatientReservation obj = guahaoXM.getRegDetail(patientCode, orgCode, regCode);
            String obj = jwSmjkService.GetRegDetail(patientCode,orgCode,regCode);
            return write(200, "获取患者预约信息成功！", "data", obj);
            return obj;
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }