代码修改

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/charge/WlyyCharge.java

@@ -32,6 +32,7 @@ public class WlyyCharge extends IdEntity {
	private Integer insuranceAmount;   //  医保支付金额
	private String needUpload;// 是否需要上传 0否(已上传) 1是（未上传） 2重复失败（上传失败）
	private String uploadLog;// 上传日志
	private String miRegisterNo;// 医保签约号(支付成功时由易联众返回)
	private String feeDetail;   //  费用明细
	private String channel;   //  医保支付渠道
	private String merchName;   //  收款单位名称
@@ -181,7 +182,15 @@ public class WlyyCharge extends IdEntity {
		this.uploadLog = uploadLog;
	}
	public String getFeeDetail() {
    public String getMiRegisterNo() {
        return miRegisterNo;
    }
    public void setMiRegisterNo(String miRegisterNo) {
        this.miRegisterNo = miRegisterNo;
    }
    public String getFeeDetail() {
		return feeDetail;
	}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwSmjkService.java

@@ -351,7 +351,9 @@ public class JwSmjkService {
            JSONObject jsonObject = new JSONObject(response);
            int status = jsonObject.getInt("status");
            if (status == 200) {
                re = jsonObject.getString("data");
                JSONArray jsonArray = jsonObject.getJSONArray("data");
                re = jsonArray.toString();
//                re = jsonObject.getString("data");
            } else {
                String msg = "处理失败，请联系管理员";
                if(!jsonObject.isNull("msg")){
@@ -399,7 +401,7 @@ public class JwSmjkService {
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseStr(response);
        return response;
    }
    /**
@@ -414,7 +416,7 @@ public class JwSmjkService {
        params.add(new BasicNameValuePair("hospitalId", hospitalId));
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseStr(response);
        return response;
    }
    /**
@@ -430,7 +432,7 @@ public class JwSmjkService {
        params.add(new BasicNameValuePair("hosDeptId", hosDeptId));
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseStr(response);
        return response;
    }
    /**
@@ -447,7 +449,7 @@ public class JwSmjkService {
        params.add(new BasicNameValuePair("doctorId", doctorId));
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseStr(response);
        return response;
    }
    /**
@@ -464,7 +466,7 @@ public class JwSmjkService {
        params.add(new BasicNameValuePair("doctorId", doctorId));
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseStr(response);
        return response;
    }
@@ -477,6 +479,7 @@ public class JwSmjkService {
    public String CreateOrder(String hospitalId,String hospitalName,String hosDeptId,String hosDeptName,
                               String doctorId,String doctorName,String arrangeDate,String patient,
                               String patientName,String cardNo,String clinicCard,String patientPhone) throws Exception{
        String re = "";
        String url = jwUrl + "/third/guahao/CreateOrder";
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("hospitalName", hospitalName));
@@ -493,7 +496,22 @@ public class JwSmjkService {
        params.add(new BasicNameValuePair("patientPhone", patientPhone));
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseStr(response);
        if (!StringUtils.isEmpty(response)) {
            JSONObject jsonObject = new JSONObject(response);
            int status = jsonObject.getInt("status");
            if (status == 200) {
                re = jsonObject.getString("data");
            } else {
                String msg = "处理失败，请联系管理员";
                if(!jsonObject.isNull("msg")){
                    msg = jsonObject.getString("msg");
                }
                throw new Exception(msg);
            }
        } else {
            throw new Exception("null response.");
        }
        return re;
    }
@@ -503,14 +521,30 @@ public class JwSmjkService {
     * @return
     * @throws Exception
     */
    public boolean CancelOrder(String orderId,String clinicCard) throws Exception{
    public Boolean CancelOrder(String orderId,String clinicCard) throws Exception{
        boolean re = false;
        String url = jwUrl + "/third/guahao/CancelOrder";
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("orderId", orderId));
        params.add(new BasicNameValuePair("clinicCard", clinicCard));
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseBool(response);
        if (!StringUtils.isEmpty(response)) {
            JSONObject jsonObject = new JSONObject(response);
            int status = jsonObject.getInt("status");
            if (status == 200) {
                re = jsonObject.getBoolean("data");
            } else {
                String msg = "处理失败，请联系管理员";
                if(!jsonObject.isNull("msg")){
                    msg = jsonObject.getString("msg");
                }
                throw new Exception(msg);
            }
        } else {
            throw new Exception("null response.");
        }
        return re;
    }
    /**
@@ -520,6 +554,7 @@ public class JwSmjkService {
     * @throws Exception
     */
    public String GetDoctorInfo(String hospitalId,String hosDeptId,String doctorId) throws Exception{
        String re = "";
        String url = jwUrl + "/third/guahao/GetDoctorInfo";
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("hospitalId", hospitalId));
@@ -527,7 +562,7 @@ public class JwSmjkService {
        params.add(new BasicNameValuePair("doctorId", doctorId));
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseStr(response);
        return response;
    }
    /**
@@ -572,7 +607,7 @@ public class JwSmjkService {
        params.add(new BasicNameValuePair("patient", patient));
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseStr(response);
        return response;
    }
    /**
@@ -582,6 +617,7 @@ public class JwSmjkService {
     * @throws Exception
     */
    public String GetRegDetail(String patient,String orgCode,String regCode) throws Exception{
        String re = "";
        String url = jwUrl + "/third/guahao/GetRegDetail";
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("patient", patient));
@@ -589,7 +625,7 @@ public class JwSmjkService {
        params.add(new BasicNameValuePair("regCode", regCode));
        String response = HttpClientUtil.post(url, params, "UTF-8");
        return responseStr(response);
        return response;
    }

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

@@ -144,7 +144,8 @@ public class BookingController extends WeixinBaseController {
        try {
//            List<Map<String, String>> list = getService(city).GetOrgList(city, filter, type, pageIndex, pageSize);
            String re = jwSmjkService.GetOrgList(type);
            return write(200, "获取机构列表成功！", "data", re);
            return re;
//            return write(200, "获取机构列表成功！", "data", re);
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }
@@ -167,7 +168,8 @@ public class BookingController extends WeixinBaseController {
        try {
//            List<Map<String, String>> list = getService(city).GetOrgDepList(hospitalId, filter, pageIndex, pageSize);
            String list = jwSmjkService.GetOrgDepList(hospitalId);
            return write(200, "获取科室列表成功！", "data", list);
            return list;
//            return write(200, "获取科室列表成功！", "data", list);
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }
@@ -191,7 +193,7 @@ public class BookingController extends WeixinBaseController {
        try {
//            List<GuahaoDoctor> list = getService(city).GetDoctorList(hospitalId, hosDeptId, filter, pageIndex, pageSize);
            String list = jwSmjkService.GetDoctorList(hospitalId,hosDeptId);
            return write(200, "获取医生列表成功！", "data", list);
            return list;
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }
@@ -211,7 +213,7 @@ public class BookingController extends WeixinBaseController {
        try {
//            List<Map<String, Object>> list = getService(city).GetDoctorArrange(hospitalId, hosDeptId, doctorId);
            String list = jwSmjkService.GetDoctorArrange(hospitalId,hosDeptId,doctorId);
            return write(200, "获取医生排班成功！", "data", list);
            return list;
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }
@@ -231,7 +233,7 @@ public class BookingController extends WeixinBaseController {
        try {
//            List<Map<String, String>> list = getService(city).GetDoctorArrangeSimple(hospitalId, hosDeptId, doctorId);
            String list = jwSmjkService.GetDoctorArrangeSimple(hospitalId,hosDeptId,doctorId);
            return write(200, "获取医生排班成功！", "data", list);
            return list;
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }
@@ -251,7 +253,7 @@ public class BookingController extends WeixinBaseController {
        try {
//            GuahaoDoctor doctor = getService(city).GetDoctorInfo(doctorId, hospitalId, hosDeptId);
            String doctor = jwSmjkService.GetDoctorInfo(hospitalId,hosDeptId,doctorId);
            return write(200, "获取医生信息成功！", "data", doctor);
            return doctor;
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }