Merge branch 'dev' of wujunjie/patient-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/SignPatientLabelInfoController.java

@@ -162,8 +162,6 @@ public class SignPatientLabelInfoController extends BaseController {
                return write(200, "查询成功", "data", jsonObject);
            }
            //JSONArray result = labelInfoService.getPatientByLabel("xh1D201703150222", labelCode, labelType, teamCode, page, pagesize);
            JSONArray result = labelInfoService.getPatientByLabel(getUID(), labelCode, labelType, teamCode, page, pagesize);
            return write(200, "查询成功", "data", result);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -224,10 +224,9 @@ public class DoctorFamilyContractController extends WeixinBaseController {
    @ResponseBody
    public String getPatientLables(String labelType, String level, String oldDoctorCode, Long teamCode) {
        try {
            //修改年度服务类型1.3.4需求
            if("1".equals(labelType)){
                JSONObject  rs =  familyContractService.getServerPatientListNum(teamCode,level,oldDoctorCode);
            if ("1".equals(labelType)) {
                JSONObject rs = familyContractService.getServerPatientListNum(teamCode, level, oldDoctorCode);
                return write(200, "查询成功！", "data", rs);
            }
@@ -477,7 +476,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            SignFamily sf = familyContractService.agent(getAccessToken(), name, doctor, doctorName,
                    healthDoctor, healthDoctorName, cDoctor.getHospital(), cDoctor.getHospitalName(),
                    idcard, ssc, mobile, emerMobile, images, healthLabel, customLabel, disease, expenses, signDoctorCode, signDoctorName, signDoctorLevel, adminTeamCode,sevId);
                    idcard, ssc, mobile, emerMobile, images, healthLabel, customLabel, disease, expenses, signDoctorCode, signDoctorName, signDoctorLevel, adminTeamCode, sevId);
            if (sf == null) {
                return error(-1, "代理签约失败！");
            } else {
@@ -560,7 +559,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                return error(-1, "健康情况标签不能为空！");
            }
            JSONObject res = familyContractService.handleSign(signType, getAccessToken(), doctor, doctorName, healthDoctor, healthDoctorName, msgid, patientIDcard, type, healthLabel, customLabel, disease, expenses, adminTeamCode,sevId);
            JSONObject res = familyContractService.handleSign(signType, getAccessToken(), doctor, doctorName, healthDoctor, healthDoctorName, msgid, patientIDcard, type, healthLabel, customLabel, disease, expenses, adminTeamCode, sevId);
            if (res.getInt("status") == -1) {
                return error(-1, "未知的处理类型！");
            } else if (res.getInt("status") == 0) {
@@ -906,6 +905,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            return error(-1, "患者信息查询失败");
        }
    }
    /**
     * 查询最近签约过期患者数据
     *
@@ -974,6 +974,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            return error(-1, "患者信息查询失败");
        }
    }
    /**
     * 查询待签约患者数据
     *
@@ -1146,13 +1147,13 @@ public class DoctorFamilyContractController extends WeixinBaseController {
    @RequestMapping(value = "/findNoHealthSignFamilyHealthNum")
    @ResponseBody
    public String findNoHealthSignFamilyHealthNum(
            @RequestParam(required = false)String labelType,
            @RequestParam(required = false) String labelType,
            @RequestParam(required = false) String patientName,
            @RequestParam(required = false)Long teamCode) {
            @RequestParam(required = false) Long teamCode) {
        try {
            //修改年度服务类型1.3.4需求
            if("1".equals(labelType)){
                JSONObject  rs =  familyContractService.getServerPatientList(teamCode);
            if ("1".equals(labelType)) {
                JSONObject rs = familyContractService.getServerPatientList(teamCode);
                return write(200, "查询成功！", "data", rs);
            }
@@ -1198,46 +1199,51 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    listNum.add(map);
                }
            } else {
                JSONArray jsonArray = list.getJSONArray("孕产妇");
                Map map = new HashMap();
                map.put("label", "孕产妇");
                List temp = new ArrayList();
                for (Object str : jsonArray) {
                    Map tempmap = new HashMap();
                    Object code = new JSONObject(str.toString()).get("code");
                    tempmap.put("code", code);
                    temp.add(tempmap);
                if (list.has("孕产妇")) {
                    JSONArray jsonArray = list.getJSONArray("孕产妇");
                    Map map = new HashMap();
                    map.put("label", "孕产妇");
                    List temp = new ArrayList();
                    for (Object str : jsonArray) {
                        Map tempmap = new HashMap();
                        Object code = new JSONObject(str.toString()).get("code");
                        tempmap.put("code", code);
                        temp.add(tempmap);
                    }
                    map.put("codes", temp);
                    map.put("number", jsonArray.length());
                    listNum.add(map);
                }
                map.put("codes", temp);
                map.put("number", jsonArray.length());
                listNum.add(map);
                JSONArray jsonArray1 = list.getJSONArray("未标注");
                Map map1 = new HashMap();
                map1.put("label", "未标注");
                List temp1 = new ArrayList();
                for (Object str : jsonArray1) {
                    Map tempmap = new HashMap();
                    Object code = new JSONObject(str.toString()).get("code");
                    tempmap.put("code", code);
                    temp1.add(tempmap);
                if (list.has("未标注")) {
                    JSONArray jsonArray1 = list.getJSONArray("未标注");
                    Map map1 = new HashMap();
                    map1.put("label", "未标注");
                    List temp1 = new ArrayList();
                    for (Object str : jsonArray1) {
                        Map tempmap = new HashMap();
                        Object code = new JSONObject(str.toString()).get("code");
                        tempmap.put("code", code);
                        temp1.add(tempmap);
                    }
                    map1.put("codes", temp1);
                    map1.put("number", jsonArray1.length());
                    listNum.add(map1);
                }
                map1.put("codes", temp1);
                map1.put("number", jsonArray1.length());
                listNum.add(map1);
                JSONArray jsonArray2 = list.getJSONArray("儿童");
                Map map2 = new HashMap();
                map2.put("label", "儿童");
                List temp2 = new ArrayList();
                for (Object str : jsonArray2) {
                    Map tempmap = new HashMap();
                    Object code = new JSONObject(str.toString()).get("code");
                    tempmap.put("code", code);
                    temp2.add(tempmap);
                if (list.has("儿童")) {
                    JSONArray jsonArray2 = list.getJSONArray("儿童");
                    Map map2 = new HashMap();
                    map2.put("label", "儿童");
                    List temp2 = new ArrayList();
                    for (Object str : jsonArray2) {
                        Map tempmap = new HashMap();
                        Object code = new JSONObject(str.toString()).get("code");
                        tempmap.put("code", code);
                        temp2.add(tempmap);
                    }
                    map2.put("codes", temp2);
                    map2.put("number", jsonArray2.length());
                    listNum.add(map2);
                }
                map2.put("codes", temp2);
                map2.put("number", jsonArray2.length());
                listNum.add(map2);
            }
            patients.put("count", signFamily.size());
            patients.put("patients", listNum);
@@ -1549,6 +1555,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
    /**
     * test
     *
     * @return
     */
    @RequestMapping(value = "/patientGroupByServerType", method = RequestMethod.GET)
@@ -1556,7 +1563,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
    @ApiOperation(value = "根据ServerType分组查询医生签约的居民")
    public String patientGroupByServerType() {
        try {
            List<Map<String,Object>>  result = familyContractService.patientGroupByServerType(getUID());
            List<Map<String, Object>> result = familyContractService.patientGroupByServerType(getUID());
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();
@@ -1606,7 +1613,6 @@ public class DoctorFamilyContractController extends WeixinBaseController {
    }
    /**
     * 是否已提醒关注
     *