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

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

@@ -1542,17 +1542,18 @@ public class SignWebService extends BaseService {
            if (flag != -1) {
                String sql = "select d.name from wlyy_sign_dict d where d.code = '" + sevId + "' and d.year ='"+DateUtil.getSignYear()+"' ";
                List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
                String[] keys = sevId.split("-");
                if (list != null && list.size() > 0) {
                    Map<String, Object> name = list.get(0);
                    String populationName = (String) name.get("name");
                    if (StringUtils.isNotBlank(populationName)) {
                        renew.setSpecialPopulation(sevId);
                        renew.setSpecialPopulation(keys[1]);
                        renew.setSpecialPopulationName(populationName);
                    }
                }
                String[] keys = sevId.split("-");
                if (keys != null && keys.length > 0) {
                    String sql2 = "select d.name from wlyy_sign_dict d where d.code = '" + keys[0] + "' and d.year ='"+DateUtil.getSignYear()+"' ";
                    List<Map<String, Object>> list2 = jdbcTemplate.queryForList(sql2);
@@ -1576,7 +1577,6 @@ public class SignWebService extends BaseService {
                        renew.setServerType(sevId);
                        renew.setServerTypeName(serverTypeName);
                    }
                }
            }
        }

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

@@ -625,8 +625,8 @@ public class DoctorSignController extends WeixinBaseController {
    @ResponseBody
    public String getSignByDoctorCodeGpbyServer(){
        try {
            //JSONArray result = patientService.getSignByDoctorCodeGpbyServer(getUID());
            JSONArray result = patientService.getSignByDoctorCodeGpbyServer("xh1D201703150222");
            JSONArray result = patientService.getSignByDoctorCodeGpbyServer(getUID());
            //JSONArray result = patientService.getSignByDoctorCodeGpbyServer("xh1D201703150222");
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            error(e);