新增居委会字段

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -2408,11 +2408,11 @@ public class SignWebService extends BaseService {
            return -1;
        }
        Country country = countryDao.findByCode(countryCode);
        if(country!=null){
        if(country==null){
            return -1;
        }
        Patient patient = patientService.findByCode(countryCode);
        if(patient!=null){
        Patient patient = patientService.findByCode(patientCode);
        if(patient==null){
            return -1;
        }
        patient.setSickVillage(countryCode);
@@ -2438,11 +2438,11 @@ public class SignWebService extends BaseService {
            return -1;
        }
        Country country = countryDao.findByCode(countryCode);
        if(country!=null){
        if(country==null){
            return -1;
        }
        Patient patient = patientService.findByCode(countryCode);
        if(patient!=null){
        Patient patient = patientService.findByCode(signFamily.getPatient());
        if(patient==null){
            return -1;
        }
        patient.setSickVillage(countryCode);

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

@@ -747,14 +747,13 @@ public class DoctorSignController extends WeixinBaseController {
    /**
     * 获取居委会字段
     * @param countryCode
     * @param patientCode
     * @return
     */
    @RequestMapping(value = "/updatePatientCountry", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String setPatientCountry(@RequestParam(required = true)String countryCode,@RequestParam(required = true)String patientCode){
    public String setPatientCountry(@RequestParam(required = true)String countryCode){
        try {
            return write(200, "保存成功", "data", signWebService.setPatientCountry(countryCode,patientCode));
            return write(200, "保存成功", "data", signWebService.setPatientCountry(countryCode,getRepUID()));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -125,7 +125,8 @@ public class PatientController extends WeixinBaseController {
                json.put("address", temp.getAddress());
                // 设置签约状态：0未签约，1三师，2家庭，3三师和家庭
                json.put("sign", sign);
                json.put("countryCode",temp.getSickVillage()==null?"":temp.getSickVillage());
                json.put("countryName",temp.getSickVillageName()==null?"":temp.getSickVillageName());
                json.put("idcardAll", temp.getIdcard());//完整身份证
                return write(200, "患者信息查询成功！", "data", json);
            } else {