版本更新，调整

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -115,6 +115,19 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/dataimport/test", request)
                 || matchers("/sys/user/pageset/getPageSet", request)
                 || matchers("/sys/user/pageset/savePageSet", request)
+                || matchers("/qc/data/sendDoctorInfos", request)
+                || matchers("/qc/data/sendDeptInfos", request)
+                || matchers("/qc/data/sendRecordTypes", request)
+                || matchers("/qc/data/sendMrRecordIng", request)
+                || matchers("/qc/data/sendMrContent", request)
+                || matchers("/qc/data/sendMrRecord", request)
+                || matchers("/qc/data/sendPatientInfo", request)
+                || matchers("/qc/data/sendDoctorAdvice", request)
+                || matchers("/qc/data/sendHomePageIng", request)
+                || matchers("/qc/data/sendHomePage", request)
+                || matchers("/qc/data/sendHomeDiagnose", request)
+                || matchers("/qc/data/sendHomeOperation", request)
+                || matchers("/qc/data/sendCrisis", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/util/TZDBConn.java

@@ -270,13 +270,9 @@ public class TZDBConn {
 				homePageVO.setName(rs.getString("BRBAXM"));//姓名
 				homePageVO.setSex(rs.getString("BRBAXB"));//性别
 				homePageVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
-<<<<<<< HEAD
 				if(StringUtil.isNotBlank(rs.getString("BRDQNL"))){
 				homePageVO.setAge(rs.getString("BRDQNL").equals("-")?null:rs.getString("BRDQNL"));//病人年龄
 				}
-=======
-				homePageVO.setAge(rs.getString("BRDQNL").equals("-")?null:rs.getString("BRDQNL"));//病人年龄
->>>>>>> master
 				homePageVO.setAgeUnit(rs.getString("BRNLDW"));//年龄单位
 				homePageVO.setNationality(rs.getString("BRBAGJ"));//国籍
 				homePageVO.setNewbornMonth(rs.getString("YENLYS"));//新生儿出生月数
@@ -404,8 +400,6 @@ public class TZDBConn {
 				homePageVO.setName(rs.getString("BRBAXM"));//姓名
 				homePageVO.setSex(rs.getString("BRBAXB"));//性别
 				homePageVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
-				homePageVO.setAge(rs.getString("BRDQNL"));//病人年龄
-				homePageVO.setAgeUnit(rs.getString("BRNLDW"));//年龄单位
 				homePageVO.setNationality(rs.getString("BRBAGJ"));//国籍
 				homePageVO.setNewbornMonth(rs.getString("YENLYS"));//新生儿出生月数
 				homePageVO.setNewbornDay(rs.getString("YENLTS"));//新生儿出生天数
@@ -562,11 +556,7 @@ public class TZDBConn {
 				behospitalInfo.setDiagnose(rs.getString("JBMSXX"));//疾病名称
 				behospitalInfo.setDoctorId(rs.getString("ZZYSID"));//医生ID
 				behospitalInfo.setDoctorName(rs.getString("ZZYSXM"));//医生姓名
-<<<<<<< HEAD
 				behospitalInfo.setIsPlacefile(rs.getString("requestflag"));
-=======
-				
->>>>>>> master
 				behospitalInfoList.add(behospitalInfo);
 			}
 		} catch (Exception e) {