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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -1579,6 +1579,7 @@ public class SignPatientLabelInfoService extends BaseService {
                    " f.id," +
                    " f.type," +
                    " f.doctor," +
                    " f.status," +
                    " f.doctor_health," +
                    " f.admin_team_code," +
                    " t.id teamCode," +
@@ -1601,6 +1602,7 @@ public class SignPatientLabelInfoService extends BaseService {
                pJson.put("photo", p.get("photo") != null ? p.get("photo") : "");
                pJson.put("id", p.get("id") != null ? p.get("id") : "");
                pJson.put("doctor", p.get("doctor") != null ? p.get("doctor") : "");
                pJson.put("status",p.get("status").equals("1")?p.get("status"):"0");
                pJson.put("doctorHealth", p.get("doctor_health") != null ? p.get("doctor_health") : "");
                if (p.get("id") != null && (doctorCode.equals(pJson.get("doctor")) || doctorCode.equals(pJson.get("doctorHealth")))) {
                    if (p.get("teamCode") != null && StringUtils.isNotEmpty(p.get("teamCode").toString())) {
@@ -1631,6 +1633,7 @@ public class SignPatientLabelInfoService extends BaseService {
                    " f.id," +
                    " f.type," +
                    " f.doctor," +
                    " f.status," +
                    " f.doctor_health," +
                    " f.admin_team_code," +
                    " t.id teamCode," +
@@ -1653,6 +1656,7 @@ public class SignPatientLabelInfoService extends BaseService {
                pJson.put("photo", p.get("photo") != null ? p.get("photo") : "");
                pJson.put("id", p.get("id") != null ? p.get("id") : "");
                pJson.put("doctor", p.get("doctor") != null ? p.get("doctor") : "");
                pJson.put("isSign",p.get("status").equals("1")?p.get("status"):"0");
                pJson.put("doctorHealth", p.get("doctor_health") != null ? p.get("doctor_health") : "");
                if (p.get("id") != null && (doctorCode.equals(pJson.get("doctor")) || doctorCode.equals(pJson.get("doctorHealth")))) {
                    if (p.get("teamCode") != null && StringUtils.isNotEmpty(p.get("teamCode").toString())) {

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

@@ -26,20 +26,20 @@ public class SignPatientLabelInfoController extends BaseController {
    @Autowired
    SignPatientLabelInfoService labelInfoService;
    @RequestMapping(value="toList",method = RequestMethod.GET)
    @RequestMapping(value="getPatientByNameOrIdcard",method = RequestMethod.GET)
    @ResponseBody
    public String search(@RequestParam String str){
    @ApiOperation("医生端搜索签约居民")
    public String search(@RequestParam(required = true) String str){
        try {
            if (StringUtils.isEmpty(str)) {
                return error(-1, "居民不能为空");
                return error(-1, "居民不能为空！");
            }
            JSONObject temp = labelInfoService.search(str,getUID());
            return write(200, "查询成功", "data", temp);
            return write(200, "查询成功！", "data", temp);
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
            return error(-1, "查询失败！");
        }
//        return labelInfoService.search(str,getUID());
    }
    /**