diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
index dbfb3c2..88c84a4 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
@@ -10,7 +10,7 @@ import java.util.Map;
  */
 public class DiagnoseEnums {
 
-    public  enum DiagnoseItemEnums{
+    public enum DiagnoseItemEnums {
         age(1, "年龄（出生日期）"),
         bmi(2, "BMI（体重指数）"),
         height(3, "身高"),
@@ -29,12 +29,15 @@ public class DiagnoseEnums {
         ckjc(16, "产科检查"),
         bc(17, "B超"),
         BCRSQK(18, "本次妊娠情况");
+
         private DiagnoseItemEnums(int id, String title) {
             this.id = id;
             this.title = title;
         }
+
         private int id;
         private String title;
+
         public static String getTitleById(int id) {
             for (DiagnoseItemEnums yn : values()) {
                 if (yn.getId() == id) {
@@ -43,6 +46,7 @@ public class DiagnoseEnums {
             }
             return null;
         }
+
         public int getId() {
             return id;
         }
@@ -53,49 +57,48 @@ public class DiagnoseEnums {
     }
 
 
-    public  enum CompareEnums{
-        GL(1, "大于(>)",">"),
-        GLE(2, "大于等于(>=)",">="),
-        LT(3, "小于(<)","<"),
-        LTE(4, "小于等于(<=)","<="),
-        EQ(5, "等于(=)","="),
-        NEQ(6, "不等于(!=)","!=");
-        private CompareEnums(int id, String title,String expression) {
+    public enum CompareEnums {
+        GL(1, "大于(>)", ">"),
+        GLE(2, "大于等于(>=)", ">="),
+        LT(3, "小于(<)", "<"),
+        LTE(4, "小于等于(<=)", "<="),
+        EQ(5, "等于(=)", "="),
+        NEQ(6, "不等于(!=)", "!=");
+
+        private CompareEnums(int id, String title, String expression) {
             this.id = id;
             this.title = title;
             this.expression = expression;
         }
+
         private int id;
         private String title;
         private String expression;
 
-        public static String getTitleById(Integer id)
-        {
-            for(CompareEnums s : CompareEnums.values()) {
-                if (s.getId() == id)
-                {
+        public static String getTitleById(Integer id) {
+            for (CompareEnums s : CompareEnums.values()) {
+                if (s.getId() == id) {
                     return s.getTitle();
                 }
 
             }
-            return  "";
+            return "";
         }
 
-        public static String getExpressionById(Integer id)
-        {
-            for(CompareEnums s : CompareEnums.values()) {
-                if (s.getId() == id)
-                {
+        public static String getExpressionById(Integer id) {
+            for (CompareEnums s : CompareEnums.values()) {
+                if (s.getId() == id) {
                     return s.getExpression();
                 }
 
             }
-            return  "";
+            return "";
         }
 
         public String getExpression() {
             return expression;
         }
+
         public int getId() {
             return id;
         }
@@ -106,7 +109,7 @@ public class DiagnoseEnums {
     }
 
 
-    public  enum TypeEnums{
+    public enum TypeEnums {
 
         SZ(1, "数值比较"),
         WZ(2, "文字包含"),
@@ -118,19 +121,18 @@ public class DiagnoseEnums {
             this.id = id;
             this.title = title;
         }
+
         private int id;
         private String title;
 
-        public static String getTitleById(Integer id)
-        {
-            for(TypeEnums s : TypeEnums.values()) {
-                if (s.getId() == id)
-                {
+        public static String getTitleById(Integer id) {
+            for (TypeEnums s : TypeEnums.values()) {
+                if (s.getId() == id) {
                     return s.getTitle();
                 }
 
             }
-            return  "";
+            return "";
         }
 
         public int getId() {
@@ -143,47 +145,45 @@ public class DiagnoseEnums {
     }
 
 
-    public  enum LogicEnums{
+    public enum LogicEnums {
 
-        Q(1, "且","&&"),
-        H(2, "或","||");
+        Q(1, "且", "&&"),
+        H(2, "或", "||");
 
-        private LogicEnums(int id, String title,String expression) {
+        private LogicEnums(int id, String title, String expression) {
             this.id = id;
             this.title = title;
             this.expression = expression;
         }
+
         private int id;
         private String title;
         private String expression;
 
-        public static String getTitleById(Integer id)
-        {
-            for(LogicEnums s : LogicEnums.values()) {
-                if (s.getId() == id)
-                {
+        public static String getTitleById(Integer id) {
+            for (LogicEnums s : LogicEnums.values()) {
+                if (s.getId() == id) {
                     return s.getTitle();
                 }
 
             }
-            return  "";
+            return "";
         }
 
-        public static String getExpressionById(Integer id)
-        {
-            for(LogicEnums s : LogicEnums.values()) {
-                if (s.getId() == id)
-                {
+        public static String getExpressionById(Integer id) {
+            for (LogicEnums s : LogicEnums.values()) {
+                if (s.getId() == id) {
                     return s.getExpression();
                 }
 
             }
-            return  "";
+            return "";
         }
 
         public String getExpression() {
             return expression;
         }
+
         public int getId() {
             return id;
         }
@@ -195,108 +195,116 @@ public class DiagnoseEnums {
 
 
     /**
-     *  isRepeat 0 重复 1不可重复
+     * isRepeat 0 重复 1不可重复
      */
-    public  enum DiagnoseDetailItemEnums{
+    public enum DiagnoseDetailItemEnums {
 
         //一般检查
-        XZ(1, "心脏",4,TypeEnums.WZ.getId(),0,""),
-        FB(2, "肺部",4,TypeEnums.WZ.getId(),0,""),
+        XZ(1, "心脏", 4, TypeEnums.WZ.getId(), 0, ""),
+        FB(2, "肺部", 4, TypeEnums.WZ.getId(), 0, ""),
+        XY(64, "血压", 19, TypeEnums.SZ.getId(), 0, ""),
 
         //辅助检查——血常规
-        XHDB(3, "血红蛋白",5,TypeEnums.SZ.getId(),0,"g/L"),
-        BXBJS(4, "白细胞计数",5,TypeEnums.SZ.getId(),0,"&times;10<sup>9</sup>/L"),
-        XXBJX(5, "血小板计数",5,TypeEnums.SZ.getId(),0,"&times;10<sup>9</sup>/L"),
-        CXGQT(6, "其他",5,TypeEnums.WZ.getId(),0,""),
+        XHDB(3, "血红蛋白", 5, TypeEnums.SZ.getId(), 0, "g/L"),
+        BXBJS(4, "白细胞计数", 5, TypeEnums.SZ.getId(), 0, "&times;10<sup>9</sup>/L"),
+        XXBJX(5, "血小板计数", 5, TypeEnums.SZ.getId(), 0, "&times;10<sup>9</sup>/L"),
+        CXGQT(6, "其他", 5, TypeEnums.WZ.getId(), 0, ""),
 
         //辅助检查——血型
-        RHXX(7, "RH血型——阳性（+）",6,TypeEnums.WZJ.getId(),1,""),
-        XT(8, "血糖",6,TypeEnums.SZ.getId(),0,"mmol/L"),
-
+        RHXX(7, "RH血型——阳性（+）", 6, TypeEnums.WZJ.getId(), 1, ""),
+        //  XT(8, "血糖",6,TypeEnums.SZ.getId(),0,"mmol/L"),
+        /**
+         * 20190808提出来
+         */
+        XT(8, "血糖", 20, TypeEnums.SZ.getId(), 0, "mmol/L"),
 
         //辅助检查——肝功能
-        XQGBZAM(9, "血清谷丙转氨酶",7,TypeEnums.SZ.getId(),0,"U/L"),
-        XQGCZAM(10, "血清谷草转氨酶",7,TypeEnums.SZ.getId(),0,"U/L"),
-        BDB(11, "白蛋白",7,TypeEnums.SZ.getId(),0,"g/L"),
-        ZDHS(12, "总胆红素",7,TypeEnums.SZ.getId(),0,"umol/L"),
-        JHDHS(13, "结合胆红素",7,TypeEnums.SZ.getId(),0,"umol/L"),
-        GGNBG(14, "丙肝——阳性（+）",7,TypeEnums.WZJ.getId(),1,""),
-
+        XQGBZAM(9, "血清谷丙转氨酶", 7, TypeEnums.SZ.getId(), 0, "U/L"),
+        XQGCZAM(10, "血清谷草转氨酶", 7, TypeEnums.SZ.getId(), 0, "U/L"),
+        BDB(11, "白蛋白", 7, TypeEnums.SZ.getId(), 0, "g/L"),
+        ZDHS(12, "总胆红素", 7, TypeEnums.SZ.getId(), 0, "umol/L"),
+        JHDHS(13, "结合胆红素", 7, TypeEnums.SZ.getId(), 0, "umol/L"),
+
+        //GGNBG(14, "丙肝——阳性（+）", 7, TypeEnums.WZJ.getId(), 1, ""),
+        /**
+         * 20190808 剔除出来
+         **/
+        GGNBG(14, "丙肝——阳性（+）", 21, TypeEnums.WZJ.getId(), 1, ""),
         // 辅助检查——乙肝五项
-        YGBMKY(15, "乙肝表面抗原——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
-        YGBMKT(16, "乙肝表面抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
-        YGEKY(17, "乙肝e抗原——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
-        YGEKT(18, "乙肝e抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
-        YGHXKT(19, "乙肝核心抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
+        YGBMKY(15, "乙肝表面抗原——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
+        YGBMKT(16, "乙肝表面抗体——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
+        YGEKY(17, "乙肝e抗原——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
+        YGEKT(18, "乙肝e抗体——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
+        YGHXKT(19, "乙肝核心抗体——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
 
         //辅助检查——肾功能
-        XQJG(20, "血清肌酐",9,TypeEnums.SZ.getId(),0,"μmol/L"),
-        XNSD(21, "血尿素氮",9,TypeEnums.SZ.getId(),0,"mmol/L"),
+        XQJG(20, "血清肌酐", 9, TypeEnums.SZ.getId(), 0, "μmol/L"),
+        XNSD(21, "血尿素氮", 9, TypeEnums.SZ.getId(), 0, "mmol/L"),
 
         //辅助检查——梅毒血清实验
-        SYJGYXYQZ(22, "实验结果——阳性（+）已确诊 ",10,TypeEnums.WZJ.getId(),1,""),
-        SYJGYXCZJG(23, "实验结果——阳性（+）初诊结果 ",10,TypeEnums.WZJ.getId(),1,""),
+        SYJGYXYQZ(22, "实验结果——阳性（+）已确诊 ", 10, TypeEnums.WZJ.getId(), 1, ""),
+        SYJGYXCZJG(23, "实验结果——阳性（+）初诊结果 ", 10, TypeEnums.WZJ.getId(), 1, ""),
 
-        HIVYQZ(63, "HIV抗体检测——阳性（+）已确诊",10,TypeEnums.WZJ.getId(),1,""),
-        HIVCZJG(64, "HIV抗体检测——阳性（+）初诊结果",10,TypeEnums.WZJ.getId(),1,""),
+        HIVYQZ(63, "HIV抗体检测——阳性（+）已确诊", 10, TypeEnums.WZJ.getId(), 1, ""),
+        HIVCZJG(64, "HIV抗体检测——阳性（+）初诊结果", 10, TypeEnums.WZJ.getId(), 1, ""),
 
         //妇科手术史（盆腔手术史）
-        YWRSSS(24, "异位妊娠手术",11,TypeEnums.WZJ.getId(),1,""),
-        ZGJLXC(25, "子宫肌瘤剥除",11,TypeEnums.WZJ.getId(),1,""),
-        PGC(26, "剖宫产",11,TypeEnums.WZJ.getId(),1,""),
-        FKSSSQT(27, "其他",11,TypeEnums.WZ.getId(),0,""),
+        YWRSSS(24, "异位妊娠手术", 11, TypeEnums.WZJ.getId(), 1, ""),
+        ZGJLXC(25, "子宫肌瘤剥除", 11, TypeEnums.WZJ.getId(), 1, ""),
+        PGC(26, "剖宫产", 11, TypeEnums.WZJ.getId(), 1, ""),
+        FKSSSQT(27, "其他", 11, TypeEnums.WZ.getId(), 0, ""),
 
         //孕产史
-        LCC(28, "流产次",12,TypeEnums.SZ.getId(),0,""),
-        CC(29, "产次",12,TypeEnums.SZ.getId(),0,""),
-        YCC(30, "引产次",12,TypeEnums.SZ.getId(),0,""),
-        PGCC(31, "剖宫产次",12,TypeEnums.SZ.getId(),0,""),
+        LCC(28, "流产次", 12, TypeEnums.SZ.getId(), 0, ""),
+        CC(29, "产次", 12, TypeEnums.SZ.getId(), 0, ""),
+        YCC(30, "引产次", 12, TypeEnums.SZ.getId(), 0, ""),
+        PGCC(31, "剖宫产次", 12, TypeEnums.SZ.getId(), 0, ""),
 
         //妇科检查
-        ZG(32, "子宫",13,TypeEnums.WZ.getId(),0,""),
-        GJ(33, "宫颈",13,TypeEnums.WZ.getId(),0,""),
-        FJ(34, "附件",13,TypeEnums.WZ.getId(),0,""),
+        ZG(32, "子宫", 13, TypeEnums.WZ.getId(), 0, ""),
+        GJ(33, "宫颈", 13, TypeEnums.WZ.getId(), 0, ""),
+        FJ(34, "附件", 13, TypeEnums.WZ.getId(), 0, ""),
 
         //既往史
-        JWSXHXTL(35, "循环系统类",14,TypeEnums.XL.getId(),0,""),
-        HXXTL(36, "呼吸系统类",14,TypeEnums.XL.getId(),0,""),
-        MNXTL(37, "泌尿系统类",14,TypeEnums.XL.getId(),0,""),
-        XHXTL(38, "消化系统类",14,TypeEnums.XL.getId(),0,""),
-        XYXTL(39, "血液系统类",14,TypeEnums.XL.getId(),0,""),
-        NFMXTL(40, "内分泌系统类",14,TypeEnums.XL.getId(),0,""),
-        DXYYL(41, "代谢营养类",14,TypeEnums.XL.getId(),0,""),
-        JWSQT(42, "其他",14,TypeEnums.WZ.getId(),0,""),
+        JWSXHXTL(35, "循环系统类", 14, TypeEnums.XL.getId(), 0, ""),
+        HXXTL(36, "呼吸系统类", 14, TypeEnums.XL.getId(), 0, ""),
+        MNXTL(37, "泌尿系统类", 14, TypeEnums.XL.getId(), 0, ""),
+        XHXTL(38, "消化系统类", 14, TypeEnums.XL.getId(), 0, ""),
+        XYXTL(39, "血液系统类", 14, TypeEnums.XL.getId(), 0, ""),
+        NFMXTL(40, "内分泌系统类", 14, TypeEnums.XL.getId(), 0, ""),
+        DXYYL(41, "代谢营养类", 14, TypeEnums.XL.getId(), 0, ""),
+        JWSQT(42, "其他", 14, TypeEnums.WZ.getId(), 0, ""),
 
         //传染病史
-        YG(43, "乙肝",15,TypeEnums.WZJ.getId(),1,""),
-        BG(44, "丙肝",15,TypeEnums.WZJ.getId(),1,""),
-        AZ(45, "艾滋",15,TypeEnums.WZJ.getId(),1,""),
-        MD(46, "梅毒",15,TypeEnums.WZJ.getId(),1,""),
-        CRBSQT(47, "其他",15,TypeEnums.WZ.getId(),0,""),
+        YG(43, "乙肝", 15, TypeEnums.WZJ.getId(), 1, ""),
+        BG(44, "丙肝", 15, TypeEnums.WZJ.getId(), 1, ""),
+        AZ(45, "艾滋", 15, TypeEnums.WZJ.getId(), 1, ""),
+        MD(46, "梅毒", 15, TypeEnums.WZJ.getId(), 1, ""),
+        CRBSQT(47, "其他", 15, TypeEnums.WZ.getId(), 0, ""),
 
         //产科检查
-        GG(48, "宫高",16,TypeEnums.SZ.getId(),0,"cm"),
-        FW(49, "腹围",16,TypeEnums.SZ.getId(),0,"cm"),
-        FZ(50, "浮肿",16,TypeEnums.XL.getId(),0,""),
-        TSEST(51, "胎数=双胎",16,TypeEnums.WZ.getId(),0,""),
-        TSLYST(52, "胎数>双胎",16,TypeEnums.WZ.getId(),0,""),
+        GG(48, "宫高", 16, TypeEnums.SZ.getId(), 0, "cm"),
+        FW(49, "腹围", 16, TypeEnums.SZ.getId(), 0, "cm"),
+        FZ(50, "浮肿", 16, TypeEnums.XL.getId(), 0, ""),
+        TSEST(51, "胎数=双胎", 16, TypeEnums.WZ.getId(), 0, ""),
+        TSLYST(52, "胎数>双胎", 16, TypeEnums.WZ.getId(), 0, ""),
 
         //B超
-        BC(53, "B超",17,TypeEnums.WZ.getId(),0,""),
+        BC(53, "B超", 17, TypeEnums.WZ.getId(), 0, ""),
 
         //本次妊娠情况
-        EX(54, "恶心",18,TypeEnums.WZJ.getId(),1,""),
-        OT(55, "呕吐",18,TypeEnums.WZJ.getId(),1,""),
-        YH(56, "眼花",18,TypeEnums.WZJ.getId(),1,""),
-        XM(57, "胸闷",18,TypeEnums.WZJ.getId(),1,""),
-        FUZ(58, "浮肿",18,TypeEnums.WZJ.getId(),1,""),
-        YDCX(59, "阴道出血",18,TypeEnums.WZJ.getId(),1,""),
-        FT(60, "腹痛",18,TypeEnums.WZJ.getId(),1,""),
-        TT(61, "头痛",18,TypeEnums.WZJ.getId(),1,""),
-        FBXZG(62, "下腹部下坠感",18,TypeEnums.WZJ.getId(),1,""),
-        BCRSQKQT(63, "其他",18,TypeEnums.WZ.getId(),0,"");
-
-        private DiagnoseDetailItemEnums(int id, String title,Integer parentId,Integer type,Integer isRepeat,String unit) {
+        EX(54, "恶心", 18, TypeEnums.WZJ.getId(), 1, ""),
+        OT(55, "呕吐", 18, TypeEnums.WZJ.getId(), 1, ""),
+        YH(56, "眼花", 18, TypeEnums.WZJ.getId(), 1, ""),
+        XM(57, "胸闷", 18, TypeEnums.WZJ.getId(), 1, ""),
+        FUZ(58, "浮肿", 18, TypeEnums.WZJ.getId(), 1, ""),
+        YDCX(59, "阴道出血", 18, TypeEnums.WZJ.getId(), 1, ""),
+        FT(60, "腹痛", 18, TypeEnums.WZJ.getId(), 1, ""),
+        TT(61, "头痛", 18, TypeEnums.WZJ.getId(), 1, ""),
+        FBXZG(62, "下腹部下坠感", 18, TypeEnums.WZJ.getId(), 1, ""),
+        BCRSQKQT(63, "其他", 18, TypeEnums.WZ.getId(), 0, "");
+
+        private DiagnoseDetailItemEnums(int id, String title, Integer parentId, Integer type, Integer isRepeat, String unit) {
             this.id = id;
             this.title = title;
             this.parentId = parentId;
@@ -304,6 +312,7 @@ public class DiagnoseEnums {
             this.isRepeat = isRepeat;
             this.unit = unit;
         }
+
         private int id;
         private String title;
         private Integer parentId;
@@ -311,29 +320,25 @@ public class DiagnoseEnums {
         private Integer isRepeat;
         private String unit;
 
-        public static String getTitleById(Integer id)
-        {
-            for(DiagnoseDetailItemEnums s : DiagnoseDetailItemEnums.values()) {
-                if (s.getId() == id)
-                {
+        public static String getTitleById(Integer id) {
+            for (DiagnoseDetailItemEnums s : DiagnoseDetailItemEnums.values()) {
+                if (s.getId() == id) {
                     return s.getTitle();
                 }
 
             }
-            return  "";
+            return "";
         }
 
 
-        public static Integer getIdByName(String name)
-        {
-            for(DiagnoseDetailItemEnums s : DiagnoseDetailItemEnums.values()) {
-                if (s.getTitle().toLowerCase().equals(name.toLowerCase()))
-                {
+        public static Integer getIdByName(String name) {
+            for (DiagnoseDetailItemEnums s : DiagnoseDetailItemEnums.values()) {
+                if (s.getTitle().toLowerCase().equals(name.toLowerCase())) {
                     return s.getId();
                 }
 
             }
-            return  null;
+            return null;
         }
 
         public int getId() {
@@ -378,102 +383,99 @@ public class DiagnoseEnums {
     }
 
 
-    public  enum JwsChildEnums{
+    public enum JwsChildEnums {
 
         //循环系统类
-        GXY(1, "高血压",35),
-        XXB(2, "先心病",35),
-        GXB(3, "冠心病",35),
-        XJT(4, "心绞痛",35),
-        XJQX(5, "心肌缺血",35),
-        XNBY(6, "心内膜炎",35),
-        XJB(7, "心肌病",35),
-        XJY(8, "心肌炎",35),
-        XBY(9, "心包炎",35),
-        XLSC(10, "心律失常",35),
+        GXY(1, "高血压", 35),
+        XXB(2, "先心病", 35),
+        GXB(3, "冠心病", 35),
+        XJT(4, "心绞痛", 35),
+        XJQX(5, "心肌缺血", 35),
+        XNBY(6, "心内膜炎", 35),
+        XJB(7, "心肌病", 35),
+        XJY(8, "心肌炎", 35),
+        XBY(9, "心包炎", 35),
+        XLSC(10, "心律失常", 35),
 
 
         //呼吸系统类
-        ZQGY(11, "支气管炎",36),
-        XC(12, "哮喘",36),
-        JH(13, "结核",36),
-        FY(14, "肺炎",36),
+        ZQGY(11, "支气管炎", 36),
+        XC(12, "哮喘", 36),
+        JH(13, "结核", 36),
+        FY(14, "肺炎", 36),
 
 
         //泌尿系统类
-        SJS(15, "肾结石",37),
-        SB(16, "肾病",37),
-        SY(17, "肾炎",37),
-        SXQSB(18, "肾小球肾病",37),
-        SXQSY(19, "肾小球肾炎",37),
-        LGASB(20, "IgA肾病",37),
+        SJS(15, "肾结石", 37),
+        SB(16, "肾病", 37),
+        SY(17, "肾炎", 37),
+        SXQSB(18, "肾小球肾病", 37),
+        SXQSY(19, "肾小球肾炎", 37),
+        LGASB(20, "IgA肾病", 37),
 
         //消化系统类
-        YXGD(21, "乙型病毒性肝炎",38),
-        WY(22, "胃炎",38),
+        YXGD(21, "乙型病毒性肝炎", 38),
+        WY(22, "胃炎", 38),
 
-        YXGY(46, "乙型肝炎",38),
+        YXGY(46, "乙型肝炎", 38),
 
-        DSY(23, "大三阳",38),
-        XSY(24, "小三阳",38),
-        BXGY(25, "丙型肝炎",38),
-        YGBMKYYX(26, "乙肝表面抗原阳性",38),
-        XHXKY(27, "消化性溃疡",38),
-        JCY(28, "结肠炎",38),
-        GNXXHBL(29, "功能性消化不良",38),
-        MXFX(30, "慢性腹泻",38),
+        DSY(23, "大三阳", 38),
+        XSY(24, "小三阳", 38),
+        BXGY(25, "丙型肝炎", 38),
+        YGBMKYYX(26, "乙肝表面抗原阳性", 38),
+        XHXKY(27, "消化性溃疡", 38),
+        JCY(28, "结肠炎", 38),
+        GNXXHBL(29, "功能性消化不良", 38),
+        MXFX(30, "慢性腹泻", 38),
 
 
         //血液系统类
-        PX(31, "贫血",39),
-        XXBJS(32, "血小板减少",39),
-        ZB(33, "紫癜",39),
+        PX(31, "贫血", 39),
+        XXBJS(32, "血小板减少", 39),
+        ZB(33, "紫癜", 39),
 
         //内分泌系统类
-        JZXGNKJZ(34, "甲状腺功能亢进症",40),
-        JZXGNJTZ(35, "甲状腺功能减退症",40),
-        JZXY(36, "甲状腺炎",40),
+        JZXGNKJZ(34, "甲状腺功能亢进症", 40),
+        JZXGNJTZ(35, "甲状腺功能减退症", 40),
+        JZXY(36, "甲状腺炎", 40),
 
         //代谢营养类
-        TNB(37, "糖尿病",41),
-        FPZ(38, "肥胖症",41),
-        GZSS(39, "骨质疏松症",41),
-        GNSXZ(40, "高尿酸血症",41),
-        TF(41, "痛风",41),
-
-        A(42, "-",50),
-        B(43, "+",50),
-        C(44, "++",50),
-        D(45, "+++",50);
-
-        private JwsChildEnums(int id, String title,Integer parentId) {
+        TNB(37, "糖尿病", 41),
+        FPZ(38, "肥胖症", 41),
+        GZSS(39, "骨质疏松症", 41),
+        GNSXZ(40, "高尿酸血症", 41),
+        TF(41, "痛风", 41),
+
+        A(42, "-", 50),
+        B(43, "+", 50),
+        C(44, "++", 50),
+        D(45, "+++", 50);
+
+        private JwsChildEnums(int id, String title, Integer parentId) {
             this.id = id;
             this.title = title;
             this.parentId = parentId;
         }
+
         private int id;
         private String title;
         private Integer parentId;
 
-        public static String getTitleById(Integer id)
-        {
-            for(JwsChildEnums s : JwsChildEnums.values()) {
-                if (s.getId() == id)
-                {
+        public static String getTitleById(Integer id) {
+            for (JwsChildEnums s : JwsChildEnums.values()) {
+                if (s.getId() == id) {
                     return s.getTitle();
                 }
 
             }
-            return  "";
+            return "";
         }
 
 
-        public static List<Map> getMapByParentId(Integer parentId)
-        {
+        public static List<Map> getMapByParentId(Integer parentId) {
             List<Map> list = new ArrayList<>();
-            for(JwsChildEnums s : JwsChildEnums.values()) {
-                if (s.getParentId() == parentId)
-                {
+            for (JwsChildEnums s : JwsChildEnums.values()) {
+                if (s.getParentId() == parentId) {
                     Map map = new HashMap();
                     map.put("id", s.getId());
                     map.put("title", s.getTitle());
@@ -484,13 +486,11 @@ public class DiagnoseEnums {
         }
 
 
-        public static Integer getIdByParentName(String parentName,String name)
-        {
+        public static Integer getIdByParentName(String parentName, String name) {
             Integer parentId = DiagnoseDetailItemEnums.getIdByName(parentName);
-            for(JwsChildEnums s : JwsChildEnums.values()) {
-                if (s.getParentId() == parentId && s.getTitle().toLowerCase().equals(name.toLowerCase()))
-                {
-                    return  s.getId();
+            for (JwsChildEnums s : JwsChildEnums.values()) {
+                if (s.getParentId() == parentId && s.getTitle().toLowerCase().equals(name.toLowerCase())) {
+                    return s.getId();
                 }
             }
             return null;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java
index 549c2ed..1c4ce98 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java
@@ -274,7 +274,7 @@ public class PatientWeightController extends BaseController {
     @TokenRequired
     public BaseResponse getWeightsReport(@PathVariable String pid,
                                          HttpServletRequest request,
-                                         @RequestParam(value = "rid", required = false) String rid, String version,@RequestParam(value = "doctorId") String doctorId) {
+                                         @RequestParam(value = "rid", required = false) String rid, String version, @RequestParam(value = "doctorId") String doctorId) {
         if (pid.isEmpty() || "null".equals(pid)) {
             return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!");
         }
@@ -293,11 +293,21 @@ public class PatientWeightController extends BaseController {
     @TokenRequired
     public BaseResponse qhdReport(@PathVariable String pid,
                                   HttpServletRequest request,
-                                  @RequestParam(value = "rid", required = false) String rid, String version,@RequestParam(value = "doctorId") String doctorId) {
+                                  @RequestParam(value = "rid", required = false) String rid, String version, @RequestParam(value = "doctorId") String doctorId) {
         if (pid.isEmpty() || "null".equals(pid)) {
             return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!");
         }
         return patientWeightService.qhdHighRiskReport(pid, getUserId(request), rid, version, doctorId);
     }
 
+    /**
+     * 修改末次月经
+     */
+    @RequestMapping(value = "/updateLastMenstrual", method = RequestMethod.POST)
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo) {
+        return patientWeightService.updateLastMenstrual(lastMenstrual, cardNo);
+    }
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 97db5af..0df2f09 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -3770,6 +3770,7 @@ public class AntenatalExaminationFacade {
             }
         }
 
+
         Map<Integer, List<DiagnoseItemModel>> mapItems = getRiskConfig(configModels);
         if (mapItems != null && mapItems.size() > 0) {
             if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.age.getId())) {
@@ -3918,6 +3919,20 @@ public class AntenatalExaminationFacade {
                         }
                     }
                 }
+                //血压
+                if (!antExcAddRequest.getBp().isEmpty() && antExcAddRequest.getBp().size() > 0) {
+                    Map map = antExcAddRequest.getBp();
+                    List<DiagnoseItemModel> ybjcItems = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ybjc.getId());
+                    if (CollectionUtils.isNotEmpty(ybjcItems)) {
+                        for (DiagnoseItemModel item : ybjcItems) {
+                            if ((double) map.get("ssy") > Double.valueOf(item.getValueOne()) && (double) map.get("ssy") < Double.valueOf(item.getValueTwo())) {
+                                list.addAll(item.getRiskIds());
+                            } else if ((double) map.get("szy") > Double.valueOf(item.getValueThree()) && (double) map.get("szy") < Double.valueOf(item.getValueFour())) {
+                                list.addAll(item.getRiskIds());
+                            }
+                        }
+                    }
+                }
             }
             if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.bc.getId())) {
                 if (StringUtils.isNotEmpty(antExcAddRequest.getbChao())) {
@@ -3984,6 +3999,7 @@ public class AntenatalExaminationFacade {
                 }
             }
 
+
             if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.xcg.getId())) {
                 if (StringUtils.isNotEmpty(antExcAddRequest.getXhdb())) {
                     String xhdb = antExcAddRequest.getXhdb();
@@ -4174,6 +4190,7 @@ public class AntenatalExaminationFacade {
                 }
             }
 
+
             if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.ygwx.getId())) {
                 if (StringUtils.isNotEmpty(antExcAddRequest.getYgbmky())) {
                     if ("yang".equals(antExcAddRequest.getYgbmky())) {
@@ -4357,6 +4374,8 @@ public class AntenatalExaminationFacade {
                     }
                 }
             }
+
+
             if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.pqsss.getId())) {
                 if (antExcAddRequest.getFksxHistory() != null && antExcAddRequest.getFksxHistory().size() > 0) {
                     //妇科手术史（盆腔手术史）
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
index 5061314..b72b0d6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
@@ -161,6 +161,8 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     private String tireNumber1;
     //血压
     private Map bp;
+
+    //丙肝
     private String bg;
     //胎数
     private List<MatDeliverAddRequest.Placenta> placentas;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java
index abd09ec..3f36737 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java
@@ -70,4 +70,8 @@ public interface PatientWeightService extends IBaseService {
     public void getSerie(Map<String, Map<Integer, Double>> series, String bmiStr, String bregmatic);
 
     String getDoctorId(List<Map<String, Object>> dayWeights2);
+
+    BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo);
+
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
index 55c8064..67f16fc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
@@ -793,6 +793,33 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
         return "";
     }
 
+    /**
+     * 修改末次月经
+     */
+    @Override
+    public BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo) {
+        if (StringUtils.isEmpty(cardNo)) {
+            return RespBuilder.buildSuccess("查询号不能为空！");
+        } else if (StringUtils.isEmpty(lastMenstrual)) {
+            return RespBuilder.buildSuccess("请填写需要纠正的末次月经！");
+        }
+        //只查孕妇
+        List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("cardNo").is(cardNo).and("type").is(1)), Patients.class);
+        if (CollectionUtils.isNotEmpty(patients)) {
+            Patients patient = new Patients();
+            patient.setLastMenses(DateUtil.parseYMD(lastMenstrual));
+
+            System.out.println(DateUtil.parseYMD(lastMenstrual));
+            for (Patients p : patients) {
+                patientsService.updatePatientOne(patient, p.getId());
+            }
+            return RespBuilder.buildSuccess("成功！");
+        } else {
+            return RespBuilder.buildSuccess("该孕妇已分娩或未建档！");
+        }
+
+    }
+
 
     @Override
     public BaseResponse wxReport(String pid) {