Merge remote-tracking branch 'origin/testv5.2'

# Conflicts:
#	src/html/disclaimer.html
#	src/html/index.html
#	src/html/information.html
#	src/html/landscape.html
#	src/html/landscapeMedical.html
#	src/html/landscapePage.html
#	src/html/scale.html
#	src/js/landscapeMedical.js
#	src/landscape.js

package.json

@@ -4,6 +4,7 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
+    "bluebird": "^3.5.5",
     "es3ify-loader": "^0.2.0",
     "jquery": "^1.12.4",
     "webpack-cli": "^3.3.1"
@@ -30,7 +31,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "webpack",
     "watch": "webpack --watch",
-    "dev": "webpack-dev-server --open http://localhost:8081/illness.html",
+    "dev": "webpack-dev-server --open",
     "server": "node server.js"
   },
   "repository": {

src/css/indexHorizontal.less

@@ -0,0 +1,272 @@
+
+ .push .recommendInfoWrapper {
+    height: 20px;
+    line-height: 20px;
+    overflow: hidden;
+    margin-top: 10px;
+    h4 {
+        float: left;
+    }
+}
+.push .labAndPacsRecommend {
+    height: 50px;
+}
+.recommendInfoBox  {
+    margin-left: 100px;
+    position: relative;
+}
+.recommendWrap {
+    height: 250px;
+}
+.labAndPacsWrapper{
+    height: 20px;
+    line-height: 20px;
+    overflow: hidden;
+}
+.push {
+    margin-top: 10px;
+    width: 53%;
+    float: left;
+    position: relative;
+    padding-right: 2%;
+    border-right: 1px solid #f0efef;
+    box-sizing: border-box;
+}
+.treat {
+    margin-top: 10px;
+    width: 38%;
+    float: left;
+    position: relative;
+    margin-left: 2%;
+}
+.disclaimer {
+    width: 5%;
+    float: left;
+    color: #d7d7d7;
+    text-align: center;
+    border-right: 1px solid #f4f3f3;
+    box-sizing: border-box;
+}
+
+.warning, .diagRecommend {
+    h4 {
+        color: #FF545B;
+    }
+}
+.symptomRecommend, .physiExamRecommend, .labAndPacsRecommend {
+    h4 {
+        color: #157FD5;
+    }
+}
+.conditTips {
+    h4 {
+        color: #E66225;
+    }
+}
+.treatRecommend  {
+    h4 {
+        color: #1AB3A9;
+    }
+}
+.icon{
+    display: block;
+    width: 20px;
+    float: left;
+}
+.labAndPacsBox, .treatItemBox {
+    position: relative;
+}
+.itemAllBox {
+    padding-right: 40px;
+    background: #fff;
+    border: 1px solid #3A73E1;
+    border-radius: 4px;
+    box-sizing: border-box;
+}
+.slideDown {
+    background-color: #fff;
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    height: 20px;
+    line-height: 20px;
+    box-shadow: -2px 0px 15px 0px #fff;
+    cursor: pointer;
+
+    img {
+        display: inline-block;
+        position: relative;
+        top: 2px;
+    }
+}
+
+.slideup {
+    background-color: #fff;
+    position: absolute;
+    float: right;
+    top: 0px;
+    right: 0px;
+    cursor: pointer;
+    line-height: 20px;
+    box-shadow: -2px 0px 15px 0px #fff;
+    img {
+        display: inline-block;
+        position: relative;
+        top: 2px;
+    }
+}
+.itemAllBox{
+    position: absolute;
+    width: 96%;
+    height: auto;
+    max-height: 230px;
+    display: none;
+    background: #fff;
+    z-index: 2;
+    left: 0;
+    top: 0;
+    margin: 10px 0;
+}
+.ellipse{
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.conditTipsbox .conditionMain {
+    height: 20px;
+    .mayIllness{
+        float: left;
+    }
+}
+.infoMsg,
+.infoMsgOn {
+    position: absolute;
+    top: 2px;
+    right: 0px;
+}
+.infoMsg,
+.infoMsgOn {
+    display: none;
+    cursor: pointer;
+}
+.durgNameBox {
+    position: relative;
+    padding-right: 15px;
+}
+.recommendInfoItemHasInfo:hover,
+.diagNameBox:hover,
+.durgNameBox:hover {
+    color: #267FD7;
+
+    .infoMsg {
+        display: inline-block;
+        width: 14px;
+        height: 14px;
+        background: url(/images/msg1.png) center center no-repeat;
+    }
+
+    .infoMsg:hover {
+        background: url(/images/msg2.png) center center no-repeat;
+    }
+}
+
+.diagNameBox {
+    position: relative;
+    padding-right: 15px;
+}
+ .more {
+    display: inline-block;
+    background-color: #fff;
+    position: absolute;
+    right: 0px;
+    color: #267FD7;
+    height: 20px;
+    line-height: 20px;
+    box-shadow: -2px 0px 15px 0px #fff;
+    cursor: pointer;
+}
+.conditTipsbox .more {
+    top: 0px;
+}
+.diagName {
+    color: #040428;
+}
+.treatItemTitle {
+    font-weight: bold;
+    font-size: 13px;
+    color: #7C828E;
+    float: left;
+    width: 60px;
+    height: 30px;
+    line-height: 30px;
+    float: left;
+}
+.treat .recommendInfoBox {
+    margin-left: 0px;
+}
+.treat .treatTextBox {
+    margin-left: 80px;
+    line-height: 30px;
+    height: 90px;
+    overflow:hidden;
+    // text-overflow:ellipsis; 
+    // display: -webkit-box;
+    // -webkit-box-orient: vertical;
+    // -webkit-line-clamp: 3;
+}
+.treat .treatDrugBox {
+    margin-left: 80px;
+    line-height: 30px;
+    height: 90px;
+    overflow: hidden;
+}
+.drugTreatmentInfoItemBox {
+    .ellipse;
+    height: 30px;
+}
+.treat .treatRecommend {
+    margin-top: 10px;
+}
+.labAndPacsRecommend  .labAndPacsTitle {
+    padding:5px; 
+    margin-right: 5px;
+    background: #e2eaf2;
+    border-radius: 4px;
+}
+.pacsRecommendwrapper {
+    margin-top: 10px;
+}
+.labAndPacsItem {
+    display: inline-block;
+    padding-right: 15px;
+}
+.treatRecommendbox {
+    margin-top: 10px;
+}
+.treatItemBox .more{
+    bottom: 0;
+    height: 30px;
+    line-height: 30px;
+}
+.itemAllBox h4{
+    float: left;
+    margin-right: 10px;
+}
+.recommendInfoItem {
+    position: relative;
+    display: inline-block;
+}
+.itemAll{
+    max-height: 230px;
+    overflow-y: auto
+}
+.recommendInfoItem {
+    position: relative;
+    padding-right: 15px;
+}
+.recommendNull {
+    color: #ADADAD;
+}
+.disclaimer, .illnessTable {
+    cursor: pointer;
+}

src/css/indexVert.less

@@ -0,0 +1,297 @@
+@import './common.less';
+
+.iframeWrap {
+    margin: 10px auto 50px;
+    padding: 20px;
+    min-width: 340px;
+}
+
+.recommendInfoWrapper {
+    border: 1px solid #F2F2F2;
+    margin-bottom: 15px;
+
+    h4 {
+        color: #000;
+        height: 40px;
+        line-height: 40px;
+        background-color: #FAEBEC;
+        font-size: 16px;
+        font-weight: bold;
+    }
+}
+
+.recommendInfoWrapper h4 i {
+    content: '';
+    width: 40px;
+    height: 40px;
+    float: left;
+}
+
+.symptomRecommend,
+.physiExamRecommend,
+.labAndPacsRecommend {
+    h4 {
+        background-color: #ECF4FC;
+    }
+}
+
+.treatRecommend {
+    h4 {
+        background-color: #E3FEFE;
+    }
+}
+
+.conditTips {
+    h4 {
+        background-color: #FDF4EE;
+    }
+}
+
+.recommendInfoBox {
+    padding: 17px;
+}
+
+.treatRecommend h4 i {
+    background: url(/images/zhiliao.png) center center no-repeat;
+}
+
+.conditTips h4 i {
+    background: url(/images/tips.png) center center no-repeat;
+}
+
+.symptomRecommend h4 i {
+    background: url(/images/inquire.png) center center no-repeat;
+}
+
+.physiExamRecommend h4 i {
+    background: url(/images/tgjc.png) center center no-repeat;
+}
+
+.labAndPacsRecommend h4 i {
+    background: url(/images/inspect.png) center center no-repeat;
+}
+
+.warning h4 i {
+    background: url(/images/warings.png) center center no-repeat;
+}
+
+.diagRecommend h4 i {
+    background: url(/images/yszd.png) center center no-repeat;
+}
+
+.recommendInfoItem {
+    padding-right: 15px;
+    float: left;
+    line-height: 25px;
+    position: relative;
+}
+
+.infoMsg,
+.infoMsgOn {
+    position: absolute;
+    top: 6px;
+    right: 0;
+}
+
+.infoMsg,
+.infoMsgOn {
+    display: none;
+    cursor: pointer;
+}
+
+.recommendInfoItemHasInfo:hover,
+.diagNameBox:hover,
+.durgNameBox:hover {
+    color: #267FD7;
+
+    .infoMsg {
+        display: inline-block;
+        width: 14px;
+        height: 14px;
+        background: url(/images/msg1.png) center center no-repeat;
+    }
+
+    .infoMsg:hover {
+        background: url(/images/msg2.png) center center no-repeat;
+    }
+}
+
+// .diagNameBox:hover {
+//     color: #267FD7;
+//     .infoMsg {
+//         display: inline-block;
+//         width: 16px;
+//         height: 16px;
+//         background: url(/images/msg1.png) center center no-repeat;
+//     }
+//     .infoMsg:hover {
+//         background: url(/images/msg2.png) center center no-repeat;
+//     }
+// }
+.diagNameBox,
+.durgNameBox {
+    position: relative;
+    padding-right: 15px;
+    .infoMsg, .infoMsgOn {
+        top: 4px;
+    }
+}
+.durgName, .diagName {
+    border-bottom: 1px solid #D1D1D1;
+}
+
+.recommendInfoBox p {
+    line-height: 25px;
+}
+
+.commonTreatmentbox {
+    padding-bottom: 10px;
+    border-bottom: 1px solid #D1D1D1;
+}
+
+.drugTreatmentbox {
+    padding-top: 10px;
+}
+
+.illnessTable {
+    color: #267FD7;
+    line-height: 28px;
+    cursor: pointer;
+}
+
+.labAndPacsBox {
+    line-height: 25px;
+}
+
+.alertModal {
+    position: relative;
+
+    .mayResult {
+        color: #838383;
+        position: relative;
+    }
+
+    .mayResultSelect {
+        line-height: 28px;
+
+        .makesureResult {
+            cursor: pointer;
+            color: @colorBlue;
+        }
+
+        .sanjiao {
+            width: 18px;
+            height: 18px;
+            display: inline-block;
+            position: relative;
+            top: 3px;
+            background: url('../images/select.png') center center no-repeat;
+        }
+    }
+}
+
+.recommendInfoItemBox {
+    position: relative;
+}
+
+.recommendInfoItemBoxLimit {
+    height: 25px;
+    overflow: hidden;
+    position: relative;
+}
+
+.commonTreatmentInfoLimit {
+    height: 75px;
+    overflow: hidden;
+    position: relative;
+}
+
+.slideDown {
+    background-color: #fff;
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+    color: @colorBlue;
+    height: 25px;
+    line-height: 25px;
+    box-shadow: -2px 0px 15px 0px #fff;
+    cursor: pointer;
+
+    i {
+        width: 10px;
+        height: 7px;
+        display: inline-block;
+        position: relative;
+        top: -2px;
+        background: url('../images/down.png') center center no-repeat;
+    }
+}
+
+.slideup {
+    background-color: #fff;
+    position: relative;
+    float: right;
+    bottom: 0px;
+    right: 0px;
+    color: @colorBlue;
+    cursor: pointer;
+
+    i {
+        width: 10px;
+        height: 7px;
+        display: inline-block;
+        position: relative;
+        top: -2px;
+        background: url('../images/up.png') center center no-repeat;
+    }
+}
+
+.responsibility {
+    text-align: center;
+    font-size: 12px;
+    color: #979797;
+    padding-top: 15px;
+}
+.disclaimer {
+    height: 40px;
+    width: 100%;
+    line-height: 40px;
+    text-align: center;
+    position: fixed;
+    bottom: 0;
+    background-color: #ececec;
+    left: 0;
+    z-index: 98;
+    .logo {
+        float: left;
+        margin-left: 15px;
+    }
+    .disclaimerInfo {
+        float: right;
+        margin-right: 15px;
+    }
+}
+.labRecommend {
+    border-bottom: 1px solid #D1D1D1;
+    margin: 5px 0;
+}
+.labAndPacsTitle {
+    border-right: 2px solid #ADADAD;
+    padding-right:5px; 
+    margin-right: 5px;
+}
+.labAndPacsItem {
+    display: inline-block;
+    padding-right: 15px;
+}
+
+.recommendNull {
+    color: #ADADAD;
+}
+.treatItemTitle {
+    font-weight: bold;
+    padding-bottom: 5px;
+}
+.disclaimerInfo {
+    cursor: pointer;
+}

src/css/landscape.css

@@ -1,494 +0,0 @@
-.bodyWrap {
-  /* width: 1000px; */
-  height: 128px;
-  overflow: hidden;
-  font-size: 13px;
-  /* padding: 13px 0 */
-}
-.iframeWrap {
-    /* margin: 10px auto 50px;
-    padding: 20px; */
-    min-width: 340px;
-    height: 100%;
-  }
-  .push {
-    width: 55%;
-    float: left;
-    padding: 13px 5px 13px 0;
-    border-right: 1px solid  #EFEEEE;
-  }
-  .treat {
-    width: 35%;
-    float: left;
-    padding: 13px 0
-  }
-  .iframeWrap .conditionHintPub {
-    /* border: 1px solid #F2F2F2; */
-    margin-bottom: 8px;
-    height: 20px;
-    line-height: 20px;
-    position: relative;
-    background: #fff;
- 
-  }
-  .iframeWrap .conditionHintPub li {
-    padding-right: 22px;
-    float: left;
-    line-height: 20px;
-    position: relative;
-    margin-bottom: 8px;
-  }
-  .iframeWrap .conditionHintPub .conditionMain {
-    margin: 0 0px 0 85px;
-    height: 20px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-  .iframeWrap .conditionHintPub .alertModal {
-    position: relative;
-    float: left;
-  }
-  .iframeWrap .conditionHintPub .alertModal .mayResult {
-    color: #838383;
-    position: relative;
-  }
-  .iframeWrap .conditionHintPub .alertModal .mayResultSelect {
-    line-height: 20px;
-  }
-  .iframeWrap .conditionHintPub .alertModal .mayResultSelect .makesureResult {
-    cursor: pointer;
-    color: #267FD7;
-  }
-  .iframeWrap .conditionHintPub .alertModal .mayResultSelect .sanjiao {
-    width: 18px;
-    height: 18px;
-    display: inline-block;
-    position: relative;
-    top: 3px;
-    background: url('../images/select.png') center center no-repeat;
-  }
-  .iframeWrap .conditionHintPub .treatPlan {
-    font-weight: bold;
-    font-size: 13px;
-    color: #7C828E;
-    float: left;
-    width: 85px;
-    text-align: right;
-    margin-right: 10px;
-  }
-  .iframeWrap .conditionHintPub .treatPlanWrap {
-    height: 20px;
-    overflow: hidden;
-    position: relative;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine {
-    margin-top: 10px;
-    height: 52px;
-    overflow: hidden;
-    position: relative;
-  }
-  .iframeWrap .conditionHintPub .treatMedicineNull {
-    margin-top: 10px;
-    height: 28px;
-    overflow: hidden;
-    position: relative;
-  }
-  .treatMedicineNull .medicinePart {
-    color: #ADADAD;
-  }
-  .treatPlanNull .commonTreat {
-    color: #ADADAD;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .medicinePart {
-    /* margin: 8px 0; */
-    position: relative;
-    height: 20px;
-    overflow: hidden;
-    line-height: 20px;
-    margin: 0 0 8px 95px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .medicine {
-    border-bottom: 1px solid #D1D1D1;
-    position: relative;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .medicine:hover {
-    color: #267FD7;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .medicine span {
-    display: none;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .medicine:hover span {
-    display: inline-block;
-    right: -20px;
-    background-color: #fff;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .medicineDis {
-    color: #D1D1D1;
-    border-bottom: 1px solid #D1D1D1;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .medicineWaring {
-    background-color: #f4c051;
-    color: #000;
-    font-size: 12px;
-    border-radius: 4px;
-    border: 1px solid #fff;
-    line-height: 18px;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .medicineWaringDis {
-    background-color: #fff;
-    color: #D1D1D1;
-    font-size: 12px;
-    border-radius: 4px;
-    line-height: 18px;
-    border: 1px solid #D1D1D1;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .medicineWaringDisMsg {
-    color: #D1D1D1;
-  }
-  .iframeWrap .conditionHintPub p {
-    line-height: 20px;
-  }
-  .iframeWrap .conditionHintPub p span {
-    display: inline-block;
-  }
-  .iframeWrap .conditionHintRecomDiag h4 {
-    color: #FF545B;
-  }
-  .iframeWrap .conditionHintRecomDiag h4 i {
-    background: url("../images/yszd.png") center center no-repeat;
-  }
-  .iframeWrap .conditionHintWz h4 {
-    color: #157FD5;
-  }
-  .iframeWrap .conditionHintWz h4 i {
-    background: url("../images/inquire.png") center center no-repeat;
-  }
-  .iframeWrap .conditionHintTg h4 {
-    color: #157FD5;
-  }
-  .iframeWrap .conditionHintTg h4 i {
-    background: url("../images/tgjc.png") center center no-repeat;
-  }
-  .iframeWrap .conditionHintInspect h4 {
-    background-color: #ECF4FC;
-  }
-  .iframeWrap .conditionHintInspect h4 i {
-    background: url("../images/inspect.png") center center no-repeat;
-  }
-  .iframeWrap .conditionHintMay h4 {
-    background-color: #FAEBEC;
-  }
-  .iframeWrap .conditionHintMay h4 i {
-    background: url("../images/yszd.png") center center no-repeat;
-  }
-  .iframeWrap .conditionHintWarings {
-    display: none;
-  }
-  .iframeWrap .conditionHintWarings h4 {
-    color: #FF545B;
-  }
-  .iframeWrap .conditionHintWarings h4 i {
-    background: url("../images/warings.png") center center no-repeat;
-  }
-  .iframeWrap .conditionHintWarings li {
-    float: left;
-    line-height: 20px;
-  }
-  .iframeWrap .conditionHintWarings li:hover {
-    color: #267FD7;
-  }
-  .iframeWrap .conditionHintKnzd {
-    display: none;
-  }
-  .iframeWrap .conditionHintKnzd h4 i {
-    background: url("../images/knzd.png") center center no-repeat;
-  }
-  .iframeWrap .conditionHintKnzd ul li {
-    float: left;
-    line-height: 20px;
-  }
-  .iframeWrap .conditionHintKnzd ul li:hover {
-    color: #267FD7;
-  }
-  .iframeWrap .conditionHintZhiliao h4 {
-    color: #1AB3A9;
-    margin-bottom: 8px;
-  }
-  .iframeWrap .conditionHintZhiliao h4 .treatPlan {
-    color: #1AB3A9;
-  }
-  .iframeWrap .conditionHintZhiliao h4 i {
-    background: url("../images/zhiliao.png") center center no-repeat;
-  }
-  .iframeWrap .conditionHintTips .mayIllness {
-    padding-bottom: 5px;
-    float: left;
-  }
-  .iframeWrap .conditionHintTips .mayIllness:hover  span{
-    color: #267FD7;
-  } 
-  .iframeWrap .conditionHintTips .mayIllness span {
-    position: relative;
-    border-bottom: 1px solid #D1D1D1;
-  }
-  .iframeWrap .conditionHintTips .mayIllness span .infoMsg {
-    position: relative;
-    border-bottom: 0;
-    float: right;
-    cursor: pointer;
-    display: none;
-  }
-  .iframeWrap .conditionHintTips .mayIllness span:hover .infoMsg {
-    display: inline-block;
-  }
-  .iframeWrap .conditionHintTips .mayIllness a {
-    border-bottom: 1px solid #D1D1D1;
-  }
-  .iframeWrap .conditionHintTips h4 {
-    color: #E66225;
-  }
-  .iframeWrap .conditionHintTips h4 i {
-    background: url("../images/tips.png") center center no-repeat;
-  }
-  .iframeWrap .illnessTable {
-    color: #040428;
-    line-height: 20px;
-    cursor: pointer;
-  }
-  .iframeWrap h4 {
-    color: #000;
-    height: 20px;
-    line-height: 20px;
-    /* background-color: #FAEBEC; */
-    font-size: 13px;
-    font-weight: bold;
-    display: inline-block;
-    position: absolute;
-    left: 0;
-  }
-  .iframeWrap h4 i {
-    content: '';
-    width: 16px;
-    height: 16px;
-    float: left;
-    margin: 2px 8px 0 0;
-  }
-  .commonTreat,
-  .conditionHintKnzdLis,
-  .conditionHintWaringsLis,
-  .conditionHintWzLis,
-  .conditionHintTgLis,
-  .conditionHintInspectLis,
-  .conditionHintRecomDiagLis,
-  .conditionHintAssistLis {
-    /* position: relative; */
-    background: #fff;
-  }
-  .conditionHintInspectNull {
-    border-bottom: 1px solid #D1D1D1;
-    padding-bottom: 5px;
-    margin-bottom: 5px;
-  }
-  .conditionHintZhiliaoNull {
-    padding-left: 20px;
-    display: none;
-  }
-  .conditionHintAssistLis,
-  .conditionHintInspectLis {
-    /* padding: 5px 0; */
-  }
-  .conditionHintAssistLis .slideDown,
-  .conditionHintInspectLis .slideDown {
-    /* padding: 5px 0 5px 0px; */
-  }
-  .conditionHintAssistLis li:first-child,
-  .conditionHintInspectLis li:first-child {
-    padding-right: 5px;
-  }
-  .pushEmpty {
-    color: #ADADAD;
-  }
-  .medicinePartLimitHeight {
-    height:20px;
-    overflow: hidden;
-    position: relative;
-    margin-bottom: 8px;
-  }
-  .medicinePartLimitHeightSpec {
-    height: 75px;
-    overflow: hidden;
-    position: relative;
-  }
-  .slideDown {
-    background-color: #fff;
-    position: absolute;
-    top: 0px;
-    right: 4px;
-    color: #267FD7;
-    height: 20px;
-    line-height: 20px;
-    box-shadow: -2px 0px 15px 0px #fff;
-    cursor: pointer;
-  }
-  .slideDown i {
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-    position: relative;
-    top: 2px;
-    background: url('../images/show.png') center center no-repeat;
-  }
-  .slideUp {
-    background-color: #fff;
-    position: absolute;
-    top: 0x;
-    right: 4px;
-    color: #267FD7;
-    height: 20px;
-    line-height: 20px;
-    box-shadow: -2px 0px 15px 0px #fff;
-    cursor: pointer;
-  }
-  .slideUp i {
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-    position: relative;
-    top: 2px;
-    background: url('../images/collapse.png') center center no-repeat;
-  }
-  .disclaimer {
-    height: 100%;
-    width: 5%;
-    line-height: 20px;
-    text-align: center;
-    bottom: 0;
-    background-color: #efefef;
-    z-index: 98;
-    float: left;
-    cursor: pointer;
-  }
-  .disclaimer a {
-    display: block;
-  }
-  .infoMsg {
-    width: 20px;
-    height: 20px;
-    position: absolute;
-    top: 0;
-    right: 2px;
-    display: none;
-    background: url('../images/msg1.png') center center no-repeat;
-    cursor: pointer;
-  }
-  .infoMsg:hover {
-    background: url('../images/msg2.png') center center no-repeat;
-  }
-  .infoMsgParent {
-    position: relative;
-  }
-  .warning {
-    background: #FFEDEE;
-    color: #FF545B;
-    border-radius: 10px;
-    height: 20px;
-  }
-  .warningImg {
-    position: relative;
-    top: 2px;
-  }
-  .infoMsgParent:hover {
-    color: #267FD7;
-  }
-  .infoMsgParent:hover .infoMsg {
-    display: block;
-  }
-  .responsibility {
-    text-align: center;
-    font-size: 12px;
-    color: #979797;
-    padding-top: 15px;
-  }
-  .treat .conditionMain {
-    /* overflow: auto; */
-  }
-  .diseaseName {
-    color: #040428;
-  }
-  .treat h4 {
-    display: block;
-    position: relative;
-  }
-  .treat .conditionHintPub .conditionMain {
-    margin: 0;
-    height: 80px;
-  }
-  .treat .slideDown {
-    right: 0;
-  }
-  .iframeWrap .conditionHintPub .treatMedicine .slideDown {
-    top: 28px;
-  }
-  .disclaimerName {
-    float: left;
-    height: 72px;
-    position: relative;
-    top: 50%;
-    left: 50%;
-    margin: -36px 0 0 -14px;
-    line-height: 18px;
-    color: #9C9C9C;
-  }
-  .disclaimerTip {
-    margin-left: 0;
-    line-height: 14px;
-    height: 56px;
-    margin: -28px 0 0 0;
-  }
-  .titleIcon {
-    position: relative;
-    width: 18px;
-    top: 1px;
-    display: block;
-    float: left;
-    margin-right: 8px;
-  }
-  .treatPlan .titleIcon{
-    right: -11px;
-  }
-  .pushBox {
-    padding-right: 40px;
-    background: #fff
-  }
-  .pushBoxBorder {
-    border: 1px solid #3A73E1;
-    border-radius: 4px;
-  }
-  .warning i {
-    display: inline-block;
-    float: left;
-    width: 20px;
-    height: 20px;
-    background: url('../images/warning.png') center center no-repeat;
-  }
-/* 滚动条宽度 */
-::-webkit-scrollbar{
-  /* 垂直滚动条宽度 */
-  width: 8px;
-  /* 水平滚动条高度 */
-  height: 8px;
-}
-/* 滑动滑块 */
-::-webkit-scrollbar-thumb{
-  background-color:rgba(0,0,0,.3);
-  height: 2px;
-  /* border-radius: 6px; */
-}
-/* 滚动条轨道 */
-::-webkit-scrollbar-track{
-  background-color:#ddd;
-}

src/css/landscapeMedical.css

@@ -1,507 +0,0 @@
-.bodyWrap {
-    /* width: 1000px; */
-    height: 116px;
-    overflow: hidden;
-    font-size: 13px;
-    /* padding: 13px 0 */
-  }
-  .iframeWrap {
-      /* margin: 10px auto 50px;
-      padding: 20px; */
-      min-width: 340px;
-      height: 100%;
-    }
-    .push {
-      width: 55%;
-      float: left;
-      padding: 18px 5px 8px 20px;
-      border-right: 1px solid  #EFEEEE;
-    }
-    .treat {
-      width: 35%;
-      float: left;
-      padding: 18px 0
-    }
-    .iframeWrap .conditionHintPub {
-      /* border: 1px solid #F2F2F2; */
-      margin-bottom: 8px;
-      height: 20px;
-      line-height: 20px;
-      position: relative;
-      background: #fff;
-   
-    }
-    .iframeWrap .conditionHintPub li {
-      padding-right: 22px;
-      float: left;
-      line-height: 20px;
-      position: relative;
-      margin-bottom: 8px;
-    }
-    .iframeWrap .conditionHintPub .conditionMain {
-      margin: 0 0px 0 62px;
-      height: 20px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-    .iframeWrap .conditionHintPub .alertModal {
-      position: relative;
-      float: left;
-    }
-    .iframeWrap .conditionHintPub .alertModal .mayResult {
-      color: #838383;
-      position: relative;
-    }
-    .iframeWrap .conditionHintPub .alertModal .mayResultSelect {
-      line-height: 20px;
-    }
-    .iframeWrap .conditionHintPub .alertModal .mayResultSelect .makesureResult {
-      cursor: pointer;
-      color: #267FD7;
-    }
-    .iframeWrap .conditionHintPub .alertModal .mayResultSelect .sanjiao {
-      width: 18px;
-      height: 18px;
-      display: inline-block;
-      position: relative;
-      top: 3px;
-      background: url('../images/select.png') center center no-repeat;
-    }
-    .iframeWrap .conditionHintPub .treatPlan {
-      font-weight: bold;
-      font-size: 13px;
-      color: #000000;
-      float: left;
-      width: 85px;
-      text-align: right;
-      margin-right: 10px;
-    }
-    .iframeWrap .conditionHintPub .treatPlanWrap {
-      height: 20px;
-      overflow: hidden;
-      position: relative;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine {
-      margin-top: 10px;
-      height: 28px;
-      overflow: hidden;
-      position: relative;
-    }
-    .iframeWrap .conditionHintPub .treatMedicineNull {
-      margin-top: 10px;
-      height: 28px;
-      overflow: hidden;
-      position: relative;
-    }
-    .treatMedicineNull .medicinePart {
-      color: #ADADAD;
-    }
-    .treatPlanNull .commonTreat {
-      color: #ADADAD;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .medicinePart {
-      /* margin: 8px 0; */
-      position: relative;
-      height: 20px;
-      overflow: hidden;
-      line-height: 20px;
-      margin: 0 0 8px 95px;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-  
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .medicine {
-      border-bottom: 1px solid #D1D1D1;
-      position: relative;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .medicine:hover {
-      color: #267FD7;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .medicine span {
-      display: none;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .medicine:hover span {
-      display: inline-block;
-      right: -20px;
-      background-color: #fff;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .medicineDis {
-      color: #D1D1D1;
-      border-bottom: 1px solid #D1D1D1;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .medicineWaring {
-      background-color: #f4c051;
-      color: #000;
-      font-size: 12px;
-      border-radius: 4px;
-      border: 1px solid #fff;
-      line-height: 18px;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .medicineWaringDis {
-      background-color: #fff;
-      color: #D1D1D1;
-      font-size: 12px;
-      border-radius: 4px;
-      line-height: 18px;
-      border: 1px solid #D1D1D1;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .medicineWaringDisMsg {
-      color: #D1D1D1;
-    }
-    .iframeWrap .conditionHintPub p {
-      line-height: 20px;
-    }
-    .iframeWrap .conditionHintPub p span {
-      display: inline-block;
-    }
-    .iframeWrap .conditionHintRecomDiag h4 {
-      color: #FF545B;
-    }
-    .iframeWrap .conditionHintRecomDiag h4 i {
-      background: url("../images/yszd.png") center center no-repeat;
-    }
-    .iframeWrap .conditionHintWz h4 {
-      color: #157FD5;
-    }
-    .iframeWrap .conditionHintWz h4 i {
-      background: url("../images/inquire.png") center center no-repeat;
-    }
-    .iframeWrap .conditionHintTg h4 {
-        color: #157FD5;
-    }
-    .iframeWrap .conditionHintTg h4 i {
-      background: url("../images/tgjc.png") center center no-repeat;
-    }
-    .iframeWrap .conditionHintInspect h4 {
-        color: #157FD5;
-    }
-    .iframeWrap .conditionHintInspect h4 i {
-      background: url("../images/inspect.png") center center no-repeat;
-    }
-    .iframeWrap .conditionHintMay h4 {
-      background-color: #FAEBEC;
-    }
-    .iframeWrap .conditionHintMay h4 i {
-      background: url("../images/yszd.png") center center no-repeat;
-    }
-    .iframeWrap .conditionHintWarings {
-      display: none;
-    }
-    .iframeWrap .conditionHintWarings h4 {
-      color: #FF545B;
-    }
-    .iframeWrap .conditionHintWarings h4 i {
-      background: url("../images/warings.png") center center no-repeat;
-    }
-    .iframeWrap .conditionHintWarings li {
-      float: left;
-      line-height: 20px;
-    }
-    .iframeWrap .conditionHintWarings li:hover {
-      color: #267FD7;
-    }
-    .iframeWrap .conditionHintKnzd {
-      display: none;
-    }
-    .iframeWrap .conditionHintKnzd h4 i {
-      background: url("../images/knzd.png") center center no-repeat;
-    }
-    .iframeWrap .conditionHintKnzd ul li {
-      float: left;
-      line-height: 20px;
-    }
-    .iframeWrap .conditionHintKnzd ul li:hover {
-      color: #267FD7;
-    }
-    .iframeWrap .conditionHintZhiliao h4 {
-      position: relative;
-      color: #1AB3A9;
-      margin-bottom: 8px;
-    }
-    .iframeWrap .conditionHintZhiliao h4 .treatPlan {
-      color: #1AB3A9;
-    }
-    .treatPlanBg {
-        position: absolute;
-        width: 95%;
-        height: 100%;
-        left: 18px;
-        top: 0;
-        background: #1AB3A9;
-        border-radius: 13px;
-        opacity: 0.1;
-        filter:alpha(opacity=10);
-        -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=10);";
-    }
-    .iframeWrap .conditionHintZhiliao h4 i {
-      background: url("../images/zhiliao.png") center center no-repeat;
-    }
-    .iframeWrap .conditionHintTips .mayIllness {
-      padding-bottom: 5px;
-      float: left;
-    }
-    .iframeWrap .conditionHintTips .mayIllness:hover  span{
-      color: #267FD7;
-    } 
-    .iframeWrap .conditionHintTips .mayIllness span {
-      position: relative;
-      border-bottom: 1px solid #D1D1D1;
-    }
-    .iframeWrap .conditionHintTips .mayIllness span .infoMsg {
-      position: relative;
-      border-bottom: 0;
-      float: right;
-      cursor: pointer;
-      display: none;
-    }
-    .iframeWrap .conditionHintTips .mayIllness span:hover .infoMsg {
-      display: inline-block;
-    }
-    .iframeWrap .conditionHintTips .mayIllness a {
-      border-bottom: 1px solid #D1D1D1;
-    }
-    .iframeWrap .conditionHintTips h4 {
-      color: #E66225;
-    }
-    .iframeWrap .conditionHintTips h4 i {
-      background: url("../images/tips.png") center center no-repeat;
-    }
-    .iframeWrap .illnessTable {
-      color: #040428;
-      line-height: 20px;
-      cursor: pointer;
-    }
-    .iframeWrap h4 {
-      color: #000;
-      height: 20px;
-      line-height: 20px;
-      /* background-color: #FAEBEC; */
-      font-size: 13px;
-      font-weight: bold;
-      display: inline-block;
-      position: absolute;
-      left: 0;
-    }
-    .iframeWrap h4 i {
-      content: '';
-      width: 16px;
-      height: 16px;
-      float: left;
-      margin: 2px 8px 0 0;
-    }
-    .commonTreat,
-    .conditionHintKnzdLis,
-    .conditionHintWaringsLis,
-    .conditionHintWzLis,
-    .conditionHintTgLis,
-    .conditionHintInspectLis,
-    .conditionHintRecomDiagLis,
-    .conditionHintAssistLis {
-      /* position: relative; */
-      background: #fff;
-    }
-    .conditionHintInspectNull {
-      border-bottom: 1px solid #D1D1D1;
-      padding-bottom: 5px;
-      margin-bottom: 5px;
-    }
-    .conditionHintZhiliaoNull {
-      padding-left: 20px;
-      display: none;
-    }
-    .conditionHintAssistLis,
-    .conditionHintInspectLis {
-      /* padding: 5px 0; */
-    }
-    .conditionHintAssistLis .slideDown,
-    .conditionHintInspectLis .slideDown {
-      /* padding: 5px 0 5px 0px; */
-    }
-    .conditionHintAssistLis li:first-child,
-    .conditionHintInspectLis li:first-child {
-      padding-right: 5px;
-    }
-    .pushEmpty {
-      color: #ADADAD;
-    }
-    .medicinePartLimitHeight {
-      height:20px;
-      overflow: hidden;
-      position: relative;
-      margin-bottom: 8px;
-    }
-    .medicinePartLimitHeightSpec {
-      height: 75px;
-      overflow: hidden;
-      position: relative;
-    }
-    .slideDown {
-      background-color: #fff;
-      position: absolute;
-      top: 0px;
-      right: 4px;
-      color: #267FD7;
-      height: 20px;
-      line-height: 20px;
-      box-shadow: -2px 0px 15px 0px #fff;
-      cursor: pointer;
-    }
-    .slideDown i {
-      width: 16px;
-      height: 16px;
-      display: inline-block;
-      position: relative;
-      top: 2px;
-      background: url('../images/show.png') center center no-repeat;
-    }
-    .slideUp {
-      background-color: #fff;
-      position: absolute;
-      top: 0x;
-      right: 4px;
-      color: #267FD7;
-      height: 20px;
-      line-height: 20px;
-      box-shadow: -2px 0px 15px 0px #fff;
-      cursor: pointer;
-    }
-    .slideUp i {
-      width: 16px;
-      height: 16px;
-      display: inline-block;
-      position: relative;
-      top: 2px;
-      background: url('../images/collapse.png') center center no-repeat;
-    }
-    .disclaimer {
-      height: 100%;
-      width: 5%;
-      line-height: 20px;
-      text-align: center;
-      bottom: 0;
-      background-color: #efefef;
-      z-index: 98;
-      float: left;
-      cursor: pointer;
-    }
-    .disclaimer a {
-      display: block;
-    }
-    .infoMsg {
-      width: 20px;
-      height: 20px;
-      position: absolute;
-      top: 0;
-      right: 2px;
-      display: none;
-      background: url('../images/msg1.png') center center no-repeat;
-      cursor: pointer;
-    }
-    .infoMsg:hover {
-      background: url('../images/msg2.png') center center no-repeat;
-    }
-    .infoMsgParent {
-      position: relative;
-    }
-    .warning {
-      background: #FFEDEE;
-      color: #FF545B;
-      border-radius: 10px;
-      height: 20px;
-    }
-    .warningImg {
-      position: relative;
-      top: 2px;
-    }
-    .infoMsgParent:hover {
-      color: #267FD7;
-    }
-    .infoMsgParent:hover .infoMsg {
-      display: block;
-    }
-    .responsibility {
-      text-align: center;
-      font-size: 12px;
-      color: #979797;
-      padding-top: 15px;
-    }
-    .treat .conditionMain {
-      /* overflow: auto; */
-    }
-    .diseaseName {
-      color: #1AB3A9;;
-    }
-    .treat h4 {
-      display: block;
-      position: relative;
-    }
-    .treat .conditionHintPub .conditionMain {
-      margin: 0;
-      height: 80px;
-    }
-    .treat .slideDown {
-      right: 0;
-    }
-    .iframeWrap .conditionHintPub .treatMedicine .slideDown {
-      /* top: 28px; */
-    }
-    .disclaimerName {
-      float: left;
-      height: 72px;
-      position: relative;
-      top: 50%;
-      left: 50%;
-      margin: -36px 0 0 -14px;
-      line-height: 18px;
-      color: #9C9C9C;
-    }
-    .disclaimerTip {
-      margin-left: 0;
-      line-height: 14px;
-      height: 56px;
-      margin: -28px 0 0 0;
-    }
-    .titleIcon {
-      position: relative;
-      width: 18px;
-      top: 1px;
-      display: block;
-      float: left;
-      margin-right: 8px;
-    }
-    .treatPlan .titleIcon{
-      right: -11px;
-    }
-    .pushBox {
-      padding-right: 40px;
-      background: #fff
-    }
-    .pushBoxBorder {
-      border: 1px solid #3A73E1;
-      border-radius: 4px;
-    }
-    .warning i {
-      display: inline-block;
-      float: left;
-      width: 20px;
-      height: 20px;
-      background: url('../images/warning.png') center center no-repeat;
-    }
-    /* 滚动条宽度 */
-::-webkit-scrollbar{
-  /* 垂直滚动条宽度 */
-  width: 8px;
-  /* 水平滚动条高度 */
-  height: 8px;
-}
-/* 滑动滑块 */
-::-webkit-scrollbar-thumb{
-  background-color:rgba(0,0,0,.3);
-  height: 2px;
-  /* border-radius: 6px; */
-}
-/* 滚动条轨道 */
-::-webkit-scrollbar-track{
-  background-color:#ddd;
-}

src/css/landscapePage.css

@@ -1,9 +0,0 @@
-p {
-    color: blueviolet;
-  }
-  .iframeContainer {
-    width: 1000px;
-    height: 128px;
-    margin: 0 auto;
-    border: 1px solid #ccc;
-  }

src/js/index.js

@@ -0,0 +1,210 @@
+require('./../css/reset.css');
+require('./../css/indexVert.less');
+require('./../css/popup.css');
+// require('./popupEdit.js');
+var Promise = require("bluebird");
+
+const $ = require("jquery");
+const { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
+const { transConf } = require('./util.js');
+const { renderRecommendInfo, renderMultRecommendInfo, renderTreat, renderRecommendConditTips } = require('./indexVertDom.js');
+
+var msg = {
+    age: getUrlArgObject('age'),
+    sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
+    symptom: getUrlArgObject('symptomJson'),
+    vital: getUrlArgObject('vitalJson'),
+    lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
+    pacs: getUrlArgObject('pacsJson'),
+    diag: getUrlArgObject('diagJson'),
+    diseaseName: getUrlArgObject('diagJson'),
+    other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
+    hosCode:getUrlArgObject('hospitalCode') || ''
+}//推送相关信息
+//   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
+window.msg = msg
+window.pushMessage = {}
+function getConf() {
+  return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode}).then((res)=>{
+        const data = res.data
+        if(data.code == 0){
+            let confArr = transConf(data.data)
+            window.confArr = confArr;
+        }
+  })
+}
+
+function getPushInfo() {
+  return  post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((res)=>{
+          var data = res.data
+          window.pushInfo = data
+          if(data.code == 0){
+              var result = data.data;
+              // if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
+              //   window.pushMessage = result.medicalIndications;//计算的需要的相关数据
+              //   renderRecommendConditTips('conditTips','病情提示', result.medicalIndications || [])
+              // }
+              if(result.dis){
+                  const diagPossible = result.dis['可能诊断'] || []//可能
+                  const diagDoubt = result.dis['疑似诊断'] || [] // 疑似
+                  const diagDeter = result.dis['确诊'] || []//确诊
+                  const diagWaring = result.dis['警惕'] || [] // 推荐警惕诊断
+                  const symptomRecommend = result.symptom || []  //推荐问诊症状
+                  const physiExamRecommend  = result.vital || [] //推荐体格检查
+                  const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+                  const labRecommend = result.lab || []
+                  const pacsRecommend = result.pacs || []
+                  const labAndPacsRecommend = [
+                      {
+                          title: '化验',
+                          className: 'labRecommend',
+                          data:  labRecommend
+                      },
+                      {
+                          title: '辅检',
+                          className: 'pacsRecommend',
+                          data:  pacsRecommend
+                    }
+                  ]
+      
+                  // const diagPossible =[]//可能
+                  // const diagDoubt =  [] // 疑似
+                  // const diagDeter =  []//确诊
+                  // const diagWaring =  [] // 推荐警惕诊断
+                  // const symptomRecommend =  []  //推荐问诊症状
+                  // const physiExamRecommend  =  [] //推荐体格检查
+                  // const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+                  // const labRecommend =  []
+                  // const pacsRecommend =  []
+                  // const labAndPacsRecommend = [
+                  //     {
+                  //         title: '化验',
+                  //         className: 'labRecommend',
+                  //         data:  labRecommend
+                  //     },
+                  //     {
+                  //         title: '辅检',
+                  //         className: 'pacsRecommend',
+                  //         data:  pacsRecommend
+                  //   }
+                  // ]
+      
+                  // renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
+                  // renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+                  // renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
+                  // renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
+                  // renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+              }
+          }
+  })
+  
+}
+
+function getTreatment() {
+  return  post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
+          var data = res.data
+          window.treatInfo = data
+          // if(data.code == 0){
+          //   var result = data.data;
+          //   renderTreat('treatRecommend','治疗方案',result)
+          //   // var num = 0;
+          //   // if(result.commonTreatment && result.commonTreatment.content){
+          //   //   ++num
+          //   //   ybzlFun(result.commonTreatment.content)//一般治疗
+          //   // }
+          //   // if(result.treatment && result.treatment.length>0){
+          //   //   ++num
+          //   //   cyywFun(result.treatment)//常用药物
+          //   // }
+          //   // if(num == 0){
+          //   //   $(".conditionHintZhiliaoNull").css("display","block")
+          //   // }
+          // } else {
+          //   renderTreat('treatRecommend','治疗方案',{})
+          // }
+
+  })
+  
+}
+
+// getConf()
+// pushInfo()
+// getTreatment();
+Promise.all([getConf(),getPushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
+  if(pushInfo.code == 0) {
+    pushResult = pushInfo.data;
+  } else {
+    pushResult = {};
+  }
+  if(treatInfo.code == 0) {
+    treatResult = treatInfo.data
+  } else {
+    treatResult = {}
+  }
+  const diagPossible =  pushResult.dis&&pushResult.dis['可能诊断'] || []//可能
+  const diagDoubt = pushResult.dis&&pushResult.dis['疑似诊断'] || [] // 疑似
+  const diagDeter = pushResult.dis&&pushResult.dis['确诊'] || []//确诊
+  const diagWaring = pushResult.dis&&pushResult.dis['警惕'] || [] // 推荐警惕诊断
+  const symptomRecommend = pushResult.symptom || []  //推荐问诊症状
+  const physiExamRecommend  = pushResult.vital || [] //推荐体格检查
+  const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+  const labRecommend = pushResult.lab || []
+  const pacsRecommend = pushResult.pacs || []
+  const medicalIndications = pushResult.medicalIndications || []
+  const labAndPacsRecommend = [
+    {
+        title: '化验',
+        className: 'labRecommend',
+        data:  labRecommend
+    },
+    {
+        title: '辅检',
+        className: 'pacsRecommend',
+        data:  pacsRecommend
+    }
+  ]
+  window.pushMessage = medicalIndications;//计算的需要的相关数据
+  for(let i = 0; i < confArr.length; i++) {
+
+    switch(confArr[i].code) {
+      case "inquiry_show":  //问诊症状
+        renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
+        break; 
+      case "health_show": //体格检查
+        renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
+        break;
+      case "illness_show": //病情提示
+        renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
+        break;
+      case "vigilant_show": //警惕诊断
+        renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
+        break;
+      case "lispacs_show": //检验检查
+        renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+        break;
+      case "cure_show": //治疗方案
+        renderTreat('treatRecommend','治疗方案',treatResult)
+        break;
+      case "diagnose_show": //推荐诊断
+        renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+        break;
+      default:
+         return
+    } 
+  }
+
+  // renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
+  // renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+  // renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
+  // renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
+  // renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+  // renderTreat('treatRecommend','治疗方案',treatResult) 
+  
+  // renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
+  
+})
+
+
+$(".disclaimerInfo").on("click", function(){
+  openNewWin("disclaimer.html")
+})

src/js/indexHorizontal.js

@@ -0,0 +1,233 @@
+require('./../css/reset.css');
+require('./../css/indexHorizontal.less');
+// require('./../css/popup.css');
+// require('./popupEdit.js');
+var Promise = require("bluebird");
+let warningImg = require('./../images/warings.png')
+let diagImg = require('./../images/yszd.png')
+let symptomImg = require('./../images/inquire.png')
+let physiExamImg = require('./../images/tgjc.png')
+let labAndPacsImg = require('./../images/inspect.png')
+let conditTipsImg = require('./../images/tips.png')
+let treatImg = require('./../images/zhiliao.png')
+
+
+
+const $ = require("jquery");
+const { post,config,getUrlArgObject,openNewWin, isIe8 } = require('./promise.js');
+const { transConf } = require('./util.js');
+const { renderRecommendInfo, renderMultRecommendInfo, renderTreat, renderRecommendConditTips } = require('./indexHorizontalDom.js');
+const is8Ie = isIe8() //判断是否为IE8
+if(is8Ie) {
+  let reg = /undefined/g
+  warningImg = warningImg.replace(reg, '')
+  diagImg = diagImg.replace(reg, '')
+  symptomImg = symptomImg.replace(reg, '')
+  physiExamImg = physiExamImg.replace(reg, '')
+  labAndPacsImg = labAndPacsImg.replace(reg, '')
+  conditTipsImg = conditTipsImg.replace(reg, '')
+  treatImg = treatImg.replace(reg, '')
+}
+
+var msg = {
+    age: getUrlArgObject('age'),
+    sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
+    symptom: getUrlArgObject('symptomJson'),
+    vital: getUrlArgObject('vitalJson'),
+    lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
+    pacs: getUrlArgObject('pacsJson'),
+    diag: getUrlArgObject('diagJson'),
+    diseaseName: getUrlArgObject('diagJson'),
+    other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
+    hosCode:getUrlArgObject('hospitalCode') || ''
+}//推送相关信息
+//   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
+window.msg = msg
+window.pushMessage = {}
+function getConf() {
+  return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode}).then((res)=>{
+      const data = res.data
+      if(data.code == 0){
+          let confArr = transConf(data.data)
+          window.confArr = confArr;
+      }
+  })
+}
+
+function getPushInfo() {
+  return post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((res)=>{
+    var data = res.data
+    window.pushInfo = data
+    // if(data.code == 0){
+    //     var result = data.data;
+    //     renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', [])
+    //     // if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
+    //     //   window.pushMessage = result.medicalIndications;//计算的需要的相关数据
+    //     //   renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', result.medicalIndications)
+    //     // }
+    //     if(result.dis){
+    //         // const diagPossible = result.dis['可能诊断'] || []//可能
+    //         // const diagDoubt = result.dis['疑似诊断'] || [] // 疑似
+    //         // const diagDeter = result.dis['确诊'] || []//确诊
+    //         // const diagWaring = result.dis['警惕'] || [] // 推荐警惕诊断
+    //         // const symptomRecommend = result.symptom || []  //推荐问诊症状
+    //         // const physiExamRecommend  = result.vital || [] //推荐体格检查
+    //         // const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+    //         // const labRecommend = result.lab || []
+    //         // const pacsRecommend = result.pacs || []
+    //         // const labAndPacsRecommend = [
+    //         //     {
+    //         //         title: '化验',
+    //         //         className: 'labRecommend',
+    //         //         data:  labRecommend
+    //         //     },
+    //         //     {
+    //         //         title: '辅检',
+    //         //         className: 'pacsRecommend',
+    //         //         data:  pacsRecommend
+    //         //   }
+    //         // ]
+
+    //         const diagPossible =[]//可能
+    //         const diagDoubt =  [] // 疑似
+    //         const diagDeter =  []//确诊
+    //         const diagWaring =  [] // 推荐警惕诊断
+    //         const symptomRecommend =  []  //推荐问诊症状
+    //         const physiExamRecommend  =  [] //推荐体格检查
+    //         const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+    //         const labRecommend =  []
+    //         const pacsRecommend =  []
+    //         const labAndPacsRecommend = [
+    //             {
+    //                 title: '化验',
+    //                 className: 'labRecommend',
+    //                 data:  labRecommend
+    //             },
+    //             {
+    //                 title: '辅检',
+    //                 className: 'pacsRecommend',
+    //                 data:  pacsRecommend
+    //           }
+    //         ]
+
+    //         renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
+    //         renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+    //         renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
+    //         renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
+    //         renderMultRecommendInfo(labAndPacsImg,'labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+    //     }
+      
+    
+      
+    // }
+  })
+}
+
+function getTreatment() {
+  post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
+    var data = res.data
+    window.treatInfo = data
+    // if(data.code == 0){
+    //   var result = data.data;
+    //   renderTreat(treatImg, 'treatRecommend','治疗方案',result)
+    //   // var num = 0;
+    //   // if(result.commonTreatment && result.commonTreatment.content){
+    //   //   ++num
+    //   //   ybzlFun(result.commonTreatment.content)//一般治疗
+    //   // }
+    //   // if(result.treatment && result.treatment.length>0){
+    //   //   ++num
+    //   //   cyywFun(result.treatment)//常用药物
+    //   // }
+    //   // if(num == 0){
+    //   //   $(".conditionHintZhiliaoNull").css("display","block")
+    //   // }
+    // } else {
+    //   renderTreat(treatImg,'treatRecommend','治疗方案',{})
+    // }
+  })
+}
+// getConf();
+// pushInfo();
+// getTreatment();
+Promise.all([getConf(),getPushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
+  if(pushInfo.code == 0) {
+    pushResult = pushInfo.data;
+  } else {
+    pushResult = {};
+  }
+  if(treatInfo.code == 0) {
+    treatResult = treatInfo.data
+  } else {
+    treatResult = {}
+  }
+  const diagPossible =  pushResult.dis&&pushResult.dis['可能诊断'] || []//可能
+  const diagDoubt = pushResult.dis&&pushResult.dis['疑似诊断'] || [] // 疑似
+  const diagDeter = pushResult.dis&&pushResult.dis['确诊'] || []//确诊
+  const diagWaring = pushResult.dis&&pushResult.dis['警惕'] || [] // 推荐警惕诊断
+  const symptomRecommend = pushResult.symptom || []  //推荐问诊症状
+  const physiExamRecommend  = pushResult.vital || [] //推荐体格检查
+  const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+  const labRecommend = pushResult.lab || []
+  const pacsRecommend = pushResult.pacs || []
+  const medicalIndications = pushResult.medicalIndications || []
+  const labAndPacsRecommend = [
+    {
+        title: '化验',
+        className: 'labRecommend',
+        data:  labRecommend
+    },
+    {
+        title: '辅检',
+        className: 'pacsRecommend',
+        data:  pacsRecommend
+    }
+  ]
+  window.pushMessage = medicalIndications;//计算的需要的相关数据
+  for(let i = 0; i < confArr.length; i++) {
+
+    switch(confArr[i].code) {
+      case "inquiry_show":  //问诊症状
+        renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
+        break; 
+      case "health_show": //体格检查
+        renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
+        break;
+      case "illness_show": //病情提示
+        renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', medicalIndications || [])
+        break;
+      case "vigilant_show": //警惕诊断
+        renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
+        break;
+      case "lispacs_show": //检验检查
+        renderMultRecommendInfo(labAndPacsImg, 'labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+        break;
+      case "cure_show": //治疗方案
+        renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult)
+        break;
+      case "diagnose_show": //推荐诊断
+        renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+        break;
+      default:
+         return
+    } 
+  }
+  const pushHei = $('.push').height()
+  if(pushHei == 0) {
+    $('.treat').css({"width":"90%"})
+  }
+  // renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
+  // renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+  // renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
+  // renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
+  // renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+  // renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult) 
+  
+  // renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', medicalIndications || [])
+  
+})
+
+
+$(".disclaimerInfo").on("click", function(){
+  openNewWin("disclaimer.html")
+})

src/js/indexHorizontalDom.js

@@ -0,0 +1,266 @@
+const $ = require("jquery");
+const { openNewWin, isIe8 } = require('./promise.js');
+const { bindTipsEvent } = require('./popupEdit.js');
+let showImg = require('./../images/show.png')
+let collapseImg = require('./../images/collapse.png')
+
+const is8Ie = isIe8() //判断是否为IE8
+if(is8Ie) {
+  let reg = /undefined/g
+  showImg = showImg.replace(reg, '')
+  collapseImg = collapseImg.replace(reg, '')
+}
+
+//推荐诊断等单种类型的
+function renderRecommendInfo(icon, className,title,data, hasInfo, type, position) {
+    const str = `<div class="recommendInfoWrapper ${className} clearfix">
+                    <h4><img src=${icon} title="${title}" class="icon">${title}:</h4>
+                    <div class="recommendInfoBox">
+                        <div class="clearfix recommendInfoItemBox ${className + 'box'}">
+                        </div>
+                    </div>
+                </div>`
+    $('.push').append(str)
+    let childrenNodeStr = ''
+    if(hasInfo) {
+        for (let i = 0; i < data.length; i++) {
+            childrenNodeStr += `<span class="recommendInfoItem recommendInfoItemHasInfo">
+                                    ${data[i].name}
+                                    <span  title="点击名称可看详细说明" class="infoMsg" data-name=${data[i].name}></span>
+                                </span>`
+        }
+    } else {
+        for (let i = 0; i < data.length; i++) {
+            childrenNodeStr += `<span class="recommendInfoItem" data-name="${data[i].name}">
+                                    ${data[i].name}
+                                </span>`
+        }
+    }
+    if(!childrenNodeStr) {
+        childrenNodeStr = '<span class ="recommendNull">暂无推荐</span>'
+    }
+    $('.'+className + 'box').append(childrenNodeStr)
+    let childrenNodeStrAll = `<div class="${className+'boxAll'} itemAllBox">
+            <h4>${title}:</h4>
+            <div class="itemAll">
+                ${childrenNodeStr}
+            </div>
+            <span class="slideup"><img src="${collapseImg}"></span>
+        </div>`
+
+    $('.push').append(childrenNodeStrAll)
+    $('.'+className + 'box' +' .infoMsg').on('click', function(){
+        const infoMsgName = $(this).attr('data-name')
+        openNewWin(`information.html?type=${type}&position=${position}&name=${infoMsgName}`)
+    })
+    $('.'+className + 'boxAll' +' .infoMsg').on('click', function(){
+        const infoMsgName = $(this).attr('data-name')
+        openNewWin(`information.html?type=${type}&position=${position}&name=${infoMsgName}`)
+    })
+    slideToggle("."+className+"box")
+}
+
+//化验和辅检等多种类型
+function renderMultRecommendInfo(icon, className,title,data, hasInfo, type, position) {
+    const str = `<div class="recommendInfoWrapper ${className} clearfix">
+                    <h4><img src=${icon} title="${title}" class="icon">${title}:</h4>
+                    <div class="recommendInfoBox ${className + 'box'}"></div>
+                </div>`
+    $('.push').append(str)
+    
+    for(let i = 0; i < data.length; i++) {
+        let childrenNodeBoxStr  = `<div class="labAndPacsWrapper ${data[i].className+'wrapper'}">
+                <div class="labAndPacsBox ${data[i].className+'box'} clearfix"> 
+                </div>
+            </div>`
+        let childrenNodeStr =  `<span class="labAndPacsTitle">${data[i].title}<i></i></span>`
+        let childrenNodeItemStrAll =  '' //更多展开框中的字符串
+        for(let j = 0; j < data[i].data.length; j++) {
+            childrenNodeStr += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
+            childrenNodeItemStrAll += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
+        }
+        if(data[i].data.length == 0) {
+            childrenNodeStr +='<span class="recommendNull">暂无推荐</span>'
+        }
+        $('.'+className + 'box').append(childrenNodeBoxStr)
+        $('.'+data[i].className+'box').append(childrenNodeStr)
+        let childrenNodeStrAll = `<div class="${data[i].className+'boxAll'} itemAllBox">
+            <h4>${data[i].title}:</h4>
+            <div class="itemAll">
+                ${childrenNodeItemStrAll}
+                <span class="slideup"><img src="${collapseImg}"></span>
+            </div>
+        </div>`
+
+        $('.push').append(childrenNodeStrAll)
+        slideToggle("."+data[i].className+"box")
+    }
+
+}
+
+function renderTreat(icon, className,title, data) {
+    const str = `<div class="recommendInfoWrapper ${className} clearfix">
+                    <h4><img src=${icon} title="${title}" class="icon">${title}:<span class="diagName">${msg.diag}</span></h4>
+                    <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
+                </div>`
+    $('.treat').append(str)
+    const commonTreatmentInfo = data.commonTreatment&&data.commonTreatment.content || ""
+    const treatmentList = data.treatment || []
+    renderTreatText('commonTreatment', '一般治疗', commonTreatmentInfo, className+'box')
+    renderTreatDrug('drugTreatment', '药物治疗', treatmentList, className+'box')
+}
+
+function renderTreatText(className,title,data, parentNode) {
+    const childrenNodeBoxStr = `
+        <div class = "treatItemBox ${className + 'box'}">
+            <p class="treatItemTitle">${title}:</p>
+            <div class="treatTextBox">
+                <p class="${className + 'Info'} clearfix"></p>
+            </div>
+        </div>
+    `
+    $('.' + parentNode).append(childrenNodeBoxStr)
+    if(!data) {
+        data = '<span class="recommendNull">暂无推荐</span>'
+    }
+    $('.' + className+'Info').html(data)
+    var commonTreatHeight = $(".commonTreatmentInfo").height()
+    if(commonTreatHeight > 75){
+        $(".treatTextBox").append('<span class="more">更多</span>')
+    }
+    $(".treat .treatTextBox").on('click',".more",function(){
+        openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+      })
+    
+}
+function renderTreatDrug(className,title,data, parentNode) {
+    const childrenNodeBoxStr = `
+        <div class = "treatItemBox ${className + 'box'}">
+            <p class="treatItemTitle">${title}:</p>
+            <div class="treatDrugBox">
+                <p class="${className + 'Info'}"></p>
+            </div>
+        </div>
+    `
+    $('.' + parentNode).append(childrenNodeBoxStr)
+    if(data.length ==0) {
+        $('.' + className+'Info').append('<span class="recommendNull">暂无推荐</span>')
+    }
+    for(let i = 0; i < data.length; i++) {
+        let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
+            ${i+1}.${data[i].bigdrugsName}(${data[i].subdrugsName}):`
+        for (let j = 0; j < data[i].medicitionsList.length; j++) {
+            childrenNodeStr += `<span class="durgNameBox">${data[i].medicitionsList[j].medicitionName}`
+            if(data[i].medicitionsList[j].drugsForbidden == '1') {
+                childrenNodeStr += `<span>慎用</span>`
+            } else if(data[i].medicitionsList[j].drugsForbidden == '2') {
+                childrenNodeStr += `<span>禁用</span>`
+            }
+            childrenNodeStr += `<span  title="点击名称可看详细说明" class="infoMsg" data-name=${data[i].medicitionsList[j].medicitionName}></span>,</span></span>`
+            childrenNodeStr += `使用率${data[i].medicitionsList[j].rate}`
+            if(j === data[i].medicitionsList.length-1) {
+                childrenNodeStr += ';'
+            } else {
+                childrenNodeStr += ','
+            }
+        }
+        childrenNodeStr += ` </p>`
+        $('.' + className+'Info').append(childrenNodeStr)
+    }
+    $('.' + className+'Info'+ ' .infoMsg').on('click', function(){
+        const infoMsgName = $(this).attr('data-name')
+        openNewWin(`information.html?type=8&position=5&name=${infoMsgName}`)
+    })
+    
+    var drugTreatmentHeight = $(".drugTreatmentInfo").height()
+    if(drugTreatmentHeight > 75){
+        $(".treatDrugBox").append('<span class="more">更多</span>')
+    } else if(drugTreatmentHeight > 30) {
+        $(".drugTreatmentInfo").append('<span class="more">更多</span>')
+    }
+    $(".treat .drugTreatmentbox").on('click',".more",function(){
+        openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+      })
+    var treatList = $(".drugTreatmentInfo").find(".drugTreatmentInfoItemBox")
+    // for(var h = 0;h < treatList.length;h++){ 
+    //     if($(treatList[h]).height() > 25){
+    //     $(treatList[h]).addClass('recommendInfoItemBoxLimit').append('<span class="slideDown">更多 <i></i></span>')
+    //     }
+    //     $(".drugTreatmentInfo").on('click',".slideDown",function(){
+    //     $(this).parents(".drugTreatmentInfoItemBox ").removeClass("recommendInfoItemBoxLimit").append('<span class="slideup">收起 <i></i></span>')
+    //     $(this).remove()
+    //     })
+    //     $(".drugTreatmentInfo").on('click',".slideup",function(){
+    //     $(this).parents(".drugTreatmentInfoItemBox ").addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
+    //     $(this).remove()
+    //     })
+    // }
+}
+
+function renderRecommendConditTips(icon, className,title,data) {
+    const str = `<div class="recommendInfoWrapper ${className} clearfix">
+                    <h4><img src=${icon} title="${title}" class="icon">${title}:</h4>
+                    <div class="recommendInfoBox  ${className + 'box'}"></div>
+                </div>`
+    $('.push').append(str)
+    if(data.length == 0) {
+        $("."+className+"box").append('<span class="recommendNull">暂无推荐</span>')
+    }
+    for(var k = 0;k < data.length;k++){
+        var tmpBq = data[k]
+        var tmpBqStr = '<p class="mayIllness">患者可能有 <span>'+tmpBq.name+'<span title="点击该名称可看详细说明" class="infoMsg"></span></span> :</p>'
+        var tmpBqStr = `<p class="mayIllness">
+                            患者可能有 <span class="diagNameBox">${tmpBq.name}:
+                                <span title="点击该名称可看详细说明" class="infoMsg" data-name=${tmpBq.name}></span>
+                            </span> 
+                        </p>`
+        var tmpBqDetailStr = ''
+        for(var m = 0;m < tmpBq.details.length;m++){
+          var tmpBqDetail = tmpBq.details[m]
+          if(tmpBqDetail.type == 1){
+            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">【${tmpBqDetail.content.name}】</span>`
+          }
+        
+        }
+        
+        $("."+className+"box").append('<div class="conditionMain ellipse clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div><span class="more">更多</span></div>')
+      }
+      $('.mayIllness .infoMsg').on('click', function(){
+        const infoMsgName = $(this).attr('data-name')
+        openNewWin(`information.html?type=22&position=2&name=${infoMsgName}`)
+      })
+      $('.alertModal .illnessTable').on('click', function(){
+        const infoMsgUrl = $(this).attr('data-url')
+        openNewWin(infoMsgUrl)
+      })
+      $(".conditTipsbox").on('click',".more",function(){
+        openNewWin(`illness.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+      })
+      bindTipsEvent()
+}
+function slideToggle(className){//展开收起
+    const domName = $(className)
+    const domNameBoxAll = $(className+'All')
+    if(domName.height() > 20){
+      domName.append(`<span class="slideDown"><img src="${showImg}"></span>`)
+    }
+    domName.on('click',".slideDown",function(){
+        $(".itemAllBox").css('display', 'none')
+        $(domNameBoxAll).css('display', 'block')
+      
+    })
+    domNameBoxAll.on('click',".slideup",function(){
+        $(domNameBoxAll).css('display', 'none')
+    })
+  }
+
+  $(".disclaimer").on("click",function() {
+    openNewWin("disclaimer.html")
+  })
+
+module.exports = {
+    renderRecommendInfo,
+    renderMultRecommendInfo,
+    renderTreat,
+    renderRecommendConditTips
+}

src/js/indexVertDom.js

@@ -0,0 +1,296 @@
+const $ = require("jquery");
+const { openNewWin } = require('./promise.js');
+const { bindTipsEvent } = require('./popupEdit.js');
+
+function renderRecommendInfo(className,title,data, hasInfo, type, position) {
+    const str = `<div class="recommendInfoWrapper ${className}">
+                    <h4><i></i>${title}</h4>
+                    <div class="recommendInfoBox">
+                        <div class="clearfix recommendInfoItemBox ${className + 'box'}">
+                        </div>
+                    </div>
+                </div>`
+    $('.recommendWrap').append(str)
+    let childrenNodeStr = ''
+    if(hasInfo) {
+        for (let i = 0; i < data.length; i++) {
+            childrenNodeStr += `<span class="recommendInfoItem recommendInfoItemHasInfo">
+                                    ${data[i].name}
+                                    <span  title="点击名称可看详细说明" class="infoMsg" data-name=${data[i].name}></span>
+                                </span>`
+        }
+    } else {
+        for (let i = 0; i < data.length; i++) {
+            childrenNodeStr += `<span class="recommendInfoItem" data-name="${data[i].name}">
+                                    ${data[i].name}
+                                </span>`
+        }
+    }
+    if(!childrenNodeStr) {
+        childrenNodeStr='<span class="recommendNull">暂无推荐</span>'
+    }
+    
+    $('.'+className + 'box').append(childrenNodeStr)
+    $('.'+className + 'box' +' .infoMsg').on('click', function(){
+        const infoMsgName = $(this).attr('data-name')
+        openNewWin(`information.html?type=${type}&position=${position}&name=${infoMsgName}`)
+    })
+    slideToggle($("."+className+"box"))
+}
+
+function renderMultRecommendInfo(className,title,data, hasInfo, type, position) {
+    const str = `<div class="recommendInfoWrapper ${className}">
+                    <h4><i></i>${title}</h4>
+                    <div class="recommendInfoBox ${className + 'box'}"></div>
+                </div>`
+    $('.recommendWrap').append(str)
+    for(let i = 0; i < data.length; i++) {
+        let childrenNodeBoxStr  = `<div class="labAndPacsBox ${data[i].className} clearfix"> </div>`
+        let childrenNodeStr =  `<span class="labAndPacsTitle">${data[i].title}<i></i></span>`
+        for(let j = 0; j < data[i].data.length; j++) {
+            childrenNodeStr += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
+        }
+        if(data[i].data.length == 0) {
+            childrenNodeStr +='<span class="recommendNull">暂无推荐</span>'
+        }
+        $('.'+className + 'box').append(childrenNodeBoxStr)
+        $('.'+data[i].className).append(childrenNodeStr)
+        slideToggle($("."+data[i].className))
+    }
+
+}
+
+function renderTreat(className,title, data) {
+    const str = `<div class="recommendInfoWrapper ${className}">
+                    <h4><i></i>${title}${msg.diag?'('+msg.diag+')':''}</h4>
+                    <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
+                </div>`
+    $('.recommendWrap').append(str)
+    const commonTreatmentInfo = data.commonTreatment&&data.commonTreatment.content || ""
+    const treatmentList = data.treatment || []
+    renderTreatText('commonTreatment', '一般治疗', commonTreatmentInfo, className+'box')
+    renderTreatDrug('drugTreatment', '常用药物治疗', treatmentList, className+'box')
+}
+
+function renderTreatText(className,title,data, parentNode) {
+    const childrenNodeBoxStr = `
+        <div class = "treatItemBox ${className + 'box'}">
+            <p class="treatItemTitle">${title}</p>
+            <p class="${className + 'Info'} clearfix"></p>
+        </div>
+    `
+    $('.' + parentNode).append(childrenNodeBoxStr)
+    if(!data) {
+        data = '<span class="recommendNull">暂无推荐</span>'
+    }
+    $('.' + className+'Info').html(data)
+    var commonTreatHeight = $(".commonTreatmentInfo").height()
+    if(commonTreatHeight > 75){
+        $(".commonTreatmentInfo").addClass('commonTreatmentInfoLimit').append('<span class="slideDown">更多 <i></i></span>')
+    }
+    $(".treatItemBox").on('click',".slideDown",function(){
+        $(this).parents(".commonTreatmentInfo").removeClass("commonTreatmentInfoLimit").append('<span class="slideup">收起 <i></i></span>')
+        $(this).remove()
+    })
+    $(".treatItemBox").on('click',".slideup",function(){
+        $(this).parents(".commonTreatmentInfo").addClass("commonTreatmentInfoLimit").append('<span class="slideDown">更多 <i></i></span>')
+        $(this).remove()
+    })
+}
+function renderTreatDrug(className,title,data, parentNode) {
+    const childrenNodeBoxStr = `
+        <div class = "treatItemBox ${className + 'box'}">
+            <p class="treatItemTitle">${title}</p>
+            <p class="${className + 'Info'}"></p>
+        </div>
+    `
+    $('.' + parentNode).append(childrenNodeBoxStr)
+    if(data.length ==0) {
+        $('.' + className+'Info').append('<span class="recommendNull">暂无推荐</span>')
+    }
+    for(let i = 0; i < data.length; i++) {
+        let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
+            ${i+1}.${data[i].bigdrugsName}(${data[i].subdrugsName}):`
+        for (let j = 0; j < data[i].medicitionsList.length; j++) {
+            childrenNodeStr += `<span class="durgNameBox"><span class="durgName">${data[i].medicitionsList[j].medicitionName}</span>`
+            if(data[i].medicitionsList[j].drugsForbidden == '1') {
+                childrenNodeStr += `<span>慎用</span>`
+            } else if(data[i].medicitionsList[j].drugsForbidden == '2') {
+                childrenNodeStr += `<span>禁用</span>`
+            }
+            childrenNodeStr += `<span  title="点击名称可看详细说明" class="infoMsg" data-name=${data[i].medicitionsList[j].medicitionName}></span>,</span></span>`
+            childrenNodeStr += `使用率${data[i].medicitionsList[j].rate}`
+            if(j === data[i].medicitionsList.length-1) {
+                childrenNodeStr += ';'
+            } else {
+                childrenNodeStr += ','
+            }
+        }
+        childrenNodeStr += ` </p>`
+        $('.' + className+'Info').append(childrenNodeStr)
+    }
+    $('.' + className+'Info'+ ' .infoMsg').on('click', function(){
+        const infoMsgName = $(this).attr('data-name')
+        openNewWin(`information.html?type=8&position=5&name=${infoMsgName}`)
+    })
+    var treatList = $(".drugTreatmentInfo").find(".drugTreatmentInfoItemBox")
+    for(var h = 0;h < treatList.length;h++){ 
+        if($(treatList[h]).height() > 25){
+        $(treatList[h]).addClass('recommendInfoItemBoxLimit').append('<span class="slideDown">更多 <i></i></span>')
+        }
+        $(".drugTreatmentInfo").on('click',".slideDown",function(){
+        $(this).parents(".drugTreatmentInfoItemBox ").removeClass("recommendInfoItemBoxLimit").append('<span class="slideup">收起 <i></i></span>')
+        $(this).remove()
+        })
+        $(".drugTreatmentInfo").on('click',".slideup",function(){
+        $(this).parents(".drugTreatmentInfoItemBox ").addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
+        $(this).remove()
+        })
+    }
+}
+
+function renderRecommendConditTips(className,title,data) {
+    const str = `<div class="recommendInfoWrapper ${className}">
+                    <h4><i></i>${title}</h4>
+                    <div class="recommendInfoBox  ${className + 'box'}"></div>
+                </div>`
+    $('.recommendWrap').append(str)
+    if(data.length == 0) {
+        $("."+className+"box").append('<span class="recommendNull">暂无推荐</span>')
+    }
+    for(var k = 0;k < data.length;k++){
+        var tmpBq = data[k]
+        var tmpBqStr = '<p class="mayIllness">患者可能有 <span>'+tmpBq.name+'<span title="点击该名称可看详细说明" class="infoMsg"></span></span> :</p>'
+        var tmpBqStr = `<p class="mayIllness">
+                            患者可能有 <span class="diagNameBox"><span class="diagName">${tmpBq.name}:</span>
+                                <span title="点击该名称可看详细说明" class="infoMsg" data-name=${tmpBq.name}></span>
+                            </span>
+                        </span>`
+        var tmpBqDetailStr = ''
+        for(var m = 0;m < tmpBq.details.length;m++){
+          var tmpBqDetail = tmpBq.details[m]
+          if(tmpBqDetail.type == 1){
+            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">${tmpBqDetail.content.name}</span>`
+          }
+          if(tmpBqDetail.type == 2){
+            var deepDetailName = `<div class="modalTitle">${tmpBqDetail.content.name}<i class="closeModal"></i></div>`
+            var deepDetailStr = ''
+            var deepDetailResultStr = ''
+            for(var n = 0;n < tmpBqDetail.content.details.length;n++){
+              var deepDetail = tmpBqDetail.content.details[n]
+              if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
+                deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">请输入${deepDetail.name}: </span><input type="text" placeholder="请输入" value=${deepDetail.value}><i class="uint">${deepDetail.uint}</i></li>`
+              }
+              if(deepDetail.controlType == 0){
+                let tooDeepDetailStr = ''
+                for(var f = 0;f<deepDetail.details.length;f++){
+                  var tooDeepDetail = deepDetail.details[f]
+                  if(deepDetail.name == '性别'){
+                    tooDeepDetailStr+='<li class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><i></i><span>'+tooDeepDetail.detailName+'</span></li>'
+                  }else{
+                    tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>（智能推荐）</a>":"")+'</li>'
+                  }
+                }
+                
+                
+                deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">${deepDetail.name}: </span>
+                                <ul class="clearfix caculateLis">
+                                    ${tooDeepDetailStr}
+                                </ul>
+                            </li>`
+                  
+              }
+            }
+            for(var v = 0;v < tmpBqDetail.content.result.length;v++){
+              deepDetailResultStr+='<p class="result"><span class="calculateName">'+tmpBqDetail.content.result[v].name+'：</span><span class="calculateResult"></span></p>'
+            }
+            tmpBqDetailStr+=`<div class="mayResult">
+                计算公式结果：
+                <span class="mayResultSelect" data-num="${k}">
+                    <span class="makesureResult">请选择</span>
+                    <span class="sanjiao"></span>
+                    <div class="popupModal">
+                        ${deepDetailName}
+                        <div class="modalMainTwo">
+                            <ul class="clearfix">
+                                ${deepDetailStr}
+                            </ul>
+                            <div class="calculate" data-num="${k}">计算</div>
+                            <p class="calculateError">请填写计算公式内容</p>
+                            <div class="resultLis">
+                                ${deepDetailResultStr}
+                            </div>
+                        </div>
+                        <div class="btnWrap clearfix">
+                            <div class="sureScore" data-type="2">关闭</div>
+                        </div>
+                    </div>
+                </span>
+            </div>`
+            
+          }
+          if(tmpBqDetail.type == 3){
+            var deepDetailName = '<span class="modalMaintltle">'+tmpBqDetail.content.name+': </span>'
+            var deepDetailStr = ''
+            for(var n = 0;n < tmpBqDetail.content.details.length;n++){
+              var deepDetail = tmpBqDetail.content.details[n]
+              deepDetailStr+='<li class="radioChecks"><i></i><span>'+deepDetail.detailName+'</span>'+(deepDetail.state == 1?"<a>（智能推荐）</a>":"")+'</li>'
+            }
+
+              tmpBqDetailStr+=`<div class="mayResult">
+                可能结果：
+                <span class="mayResultSelect" data-num="${k}"><span class="makesureResult">请选择</span><i class="sanjiao"></i>
+                    <div class="popupModal">
+                    <div class="modalTitle">
+                        结果选择<i class="closeModal"></i>
+                    </div>
+                    <div class="modalMainOne">
+                        ${deepDetailName}
+                        <ul class="clearfix">
+                            ${deepDetailStr}
+                        </ul>
+                    </div>
+                    <div class="btnWrap clearfix">
+                        <div class="sureScore" data-type="3" data-num="${k}">确定</div>
+                    </div>
+                </div>
+                </span>
+            </div>`
+          }
+        }
+        if(tmpBqStr != '' || tmpBqDetailStr != ''){
+          $(".conditionHintTipsNull").css("display","none")
+        }
+        // $(".conditionHintTips").append('<div class="conditionMain clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div></div>')
+        $("."+className+"box").append('<div class="conditionMain clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div></div>')
+      }
+      $('.mayIllness .infoMsg').on('click', function(){
+        const infoMsgName = $(this).attr('data-name')
+        openNewWin(`information.html?type=22&position=2&name=${infoMsgName}`)
+      })
+      $('.alertModal .illnessTable').on('click', function(){
+        const infoMsgUrl = $(this).attr('data-url')
+        openNewWin(infoMsgUrl)
+      })
+      bindTipsEvent()
+}
+function slideToggle(domName){//展开收起
+    if(domName.height() > 25){
+      domName.addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
+    }
+    domName.on('click',".slideDown",function(){
+      domName.removeClass("recommendInfoItemBoxLimit").append('<span class="slideup">收起 <i></i></span>')
+      $(this).remove()
+    })
+    domName.on('click',".slideup",function(){
+      domName.addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
+      $(this).remove()
+    })
+  }
+
+module.exports = {
+    renderRecommendInfo,
+    renderMultRecommendInfo,
+    renderTreat,
+    renderRecommendConditTips
+}

src/js/landscapeMedical.js

@@ -1,118 +0,0 @@
-require('./../css/landscapeMedical.css');
-require('./../css/reset.css');
-require('./../css/popup.css');
-require('./popup');
-const $ = require("jquery");
-const { post,config,getUrlArgObject, openNewWin } = require('./promise.js');
-
-const {bqtsFun,ybzlFun,cyywFun,tjwzFun,tjtgFun,tjhyFun,tjfjFun, tjzdFun, slideToggle} = require('./landscapeDom.js');
-//   symptom: "恶心呕吐腰痛", //胸痛，背痛，恶心，呕吐     //恶心呕吐腰痛   //牙周袋形成
-
-var msg = {
-  age: getUrlArgObject('age'),
-  sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
-  symptom: getUrlArgObject('symptomJson'),
-  vital: getUrlArgObject('vitalJson'),
-  lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
-  pacs: getUrlArgObject('pacsJson'),
-  diag: getUrlArgObject('diagJson'),
-  diseaseName: getUrlArgObject('diagJson'),
-  other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-  hosCode:getUrlArgObject('hospitalCode') || ''
-}//推送相关信息
-
-window.msg = msg
-window.pushMessage = {}
-
-post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((res)=>{
-  var data = res.data
-  if(data.code == 0){
-    var result = data.data;
-    if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
-      window.pushMessage = result.medicalIndications;//计算的需要的相关数据
-      bqtsFun(result.medicalIndications)
-    }
-    if(result.dis){
-      var proB = result.dis['可能诊断'] || []//可能
-      var proY = result.dis['确诊'] || []//确诊
-      var proWaring = result.dis['警惕'] || []
-      tjzdFun(proWaring, 'warning')
-      tjzdFun(proY)
-      tjzdFun(proB)
-      
-      slideToggle($(".conditionHintRecomDiagLis")) 
-      $(".infoMsgParent .infoMsg").on("click",function(){
-        const infoMsgName = $(this).parent().attr('data-name')
-        openNewWin(`information.html?type=7&position=2&name=${infoMsgName}`)
-      })
-      if(proY.length == 0 && proB.length == 0 && proWaring.length == 0){
-        $(".conditionHintRecomDiagLis").css("display","none")
-      }else{
-        $(".conditionHintRecomDiagLisNull").css("display","none")
-      }
-    }
-    if(result.symptom && result.symptom.length > 0){//推荐问诊症状
-      $(".conditionHintWzNull").css("display","none")
-      tjwzFun(result.symptom)
-    }
-    if(result.pacs && result.pacs.length > 0){//体格检查
-      $(".conditionHintTgNull").css("display","none")
-      tjtgFun(result.pacs)
-    }
-    if(result.pacs && result.lab.length > 0){
-      $(".conditionHintAssistLis").css({
-        "border-top":"1px solid #D1D1D1"
-      })
-    }
-    if(result.lab && result.lab.length > 0){//化验
-      $(".conditionHintInspectNull").css("display","none")
-      $(".conditionHintAssistNull").css("display","none")
-      tjhyFun(result.lab)
-    }
-    if(result.pacs && result.pacs.length > 0){//辅检
-      $(".conditionHintInspectNull").css("display","none")
-      $(".conditionHintAssistNull").css("display","none")
-      tjfjFun(result.pacs)
-    }
-  }
-})
-
-$(".disclaimer").on("click",function() {
-  openNewWin("disclaimer.html")
-})
-post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
-  var data = res.data
-  if(data.code == 0){
-    $(".diseaseName").html(msg.diag)
-    var result = data.data;
-    var num = 0;
-    if(result.commonTreatment && result.commonTreatment.content){
-      $(".treatPlanNull").css("display","none")
-      ++num
-      ybzlFun(result.commonTreatment.content)//一般治疗
-      
-    }else {
-      $(".treatPlanNull").css("display","block")
-    }
-    if(result.treatment && result.treatment.length>0){
-      $(".treatMedicineNull").css("display","none")
-      ++num
-      cyywFun(result.treatment)//常用药物
-    } else {
-      $(".treatMedicineNull").css("display","block")
-      $(".treatMedicine").css("display","none")
-    }
-    $(".conditionHintZhiliaoAp ").on('click',".slideDown",function(){
-      openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
-    })
-    if(num == 0){
-      $(".conditionHintZhiliaoNull").css("display","block")
-    }
-  }else{
-    $(".treatMedicine").css("display","none")
-    $(".treatPlanNull").css("display","block")
-    $(".treatMedicineNull").css("display","block")
-  }
-})
-
-

src/js/popupEdit.js

@@ -0,0 +1,159 @@
+const {post,config} = require('./promise.js');
+const $ = require("jquery");
+
+function bindTipsEvent() {
+
+    $(".conditTips").on('click',".radioChecks",function(e){
+        e.stopPropagation()
+        $(this).attr("data-select","select").children("i").css({
+          "background":"url('../images/sex2.png') center center no-repeat"
+        })
+        $(this).siblings().attr("data-select","").children("i").css("background","url('../images/sex1.png') center center no-repeat")
+      })
+      $(".conditTips").on('click',".closeModal",function(e){
+        e.stopPropagation()
+        $(this).parents(".popupModal").css("display","none")
+      })
+      $(".conditTips").on('click',".popupModal",function(e){
+        e.stopPropagation()
+      })
+      
+      $(".conditTips").on('click',".mayResultSelect",function(){
+        $(".popupModal").css('display',"none")
+        $(this).children(".popupModal").css('display',"block")
+        var that = $(this);
+        var numFlg = $(this).attr("data-num")
+        var tmpMoadlData = window.pushMessage[numFlg]
+        for(var i = 0;i<tmpMoadlData.details.length;i++){
+          var tmpPushMsgDetail = tmpMoadlData.details[i]
+          if(tmpPushMsgDetail.type == 2){
+            for(var m = 0;m < tmpPushMsgDetail.content.details.length;m++){
+              var tmpPushMsgDetailContentVal = tmpPushMsgDetail.content.details[m]
+              if(that.find(".makesureResult").html() != '请选择'){
+                if(tmpPushMsgDetailContentVal.controlType == 0){
+                  var domList = that.find(".caculateLis").children("li")
+                  for(var n =0;n < tmpPushMsgDetailContentVal.details.length;n++){
+                    if(tmpPushMsgDetailContentVal.details[n].state == 1){
+                      domList.eq(n).attr("data-select","select").children("i").css({
+                        "background":"url('../images/sex2.png') center center no-repeat"
+                      })
+                    }
+                    if(tmpPushMsgDetailContentVal.details[n].state == 0){
+                      domList.eq(n).attr("data-select","").children("i").css({
+                        "background":"url('../images/sex1.png') center center no-repeat"
+                      })
+                    }
+                  }
+                }
+                if(tmpPushMsgDetailContentVal.controlType == 2){
+                  var domLis = that.find("input[type=text]").eq(m)
+                  $(domLis).val(tmpPushMsgDetailContentVal.value)
+                }
+              }
+            }
+          }
+          if(tmpPushMsgDetail.type == 3 && that.find(".sureScore").attr("data-type") == 3){
+            for(var a = 0;a < tmpPushMsgDetail.content.details.length;a++){
+              var tmpPushMsgDetailContentValS = tmpPushMsgDetail.content.details[a]
+              var domLi = that.find(".radioChecks")
+              for(var b = 0;b <domLi.length;b++){
+                if(that.find(".makesureResult").html() == tmpPushMsgDetailContentValS.detailName){
+                  domLi.eq(a).attr("data-select","select").children("i").css({
+                    "background":"url('../images/sex2.png') center center no-repeat"
+                  })
+                }else{
+                  domLi.eq(a).attr("data-select","").children("i").css({
+                    "background":"url('../images/sex1.png') center center no-repeat"
+                  })
+                }
+              }
+            }
+          }
+        }
+      })
+      $(".conditTips").on('click',".sureScore",function(e){
+        e.stopPropagation()
+        if($(this).attr("data-type") == 3){
+          var tempVal = $(this).parents(".mayResultSelect").find(".radioChecks[data-select='select'] span").html()
+          tempVal && $(this).parents(".mayResultSelect").find(".makesureResult").html(tempVal)
+        }
+        $(this).parents(".popupModal").css('display',"none")
+      })
+      $(".conditTips").on('click','.calculate',function(e){
+        e.stopPropagation()
+        var that = $(this)
+        var numFlg = that.attr("data-num")
+        var tmpMoadlData = window.pushMessage[numFlg]
+        var paramsJson = {}
+        var resultParams = {}
+        for(var i = 0;i<tmpMoadlData.details.length;i++){
+          var tmpPushMsgDetail = tmpMoadlData.details[i]
+          if(tmpPushMsgDetail.type == 2){
+            var tmpDetailArr = []
+            paramsJson = tmpPushMsgDetail;
+            for(var m = 0;m < tmpPushMsgDetail.content.details.length;m++){
+              var tmpPushMsgDetailContentVal = tmpPushMsgDetail.content.details[m]
+              if(tmpPushMsgDetailContentVal.controlType == 0){
+                var domList = that.parent(".modalMainTwo").find(".caculateLis").children("li")
+                for(var n =0;n < domList.length;n++){
+                  if($(domList[n]).attr("data-select")){
+                    tmpPushMsgDetailContentVal.details[n].state = 1
+                  }else{
+                    tmpPushMsgDetailContentVal.details[n].state = 0
+                  }
+                }
+              }
+              if(tmpPushMsgDetailContentVal.controlType == 2){
+                var domLis = that.parent(".modalMainTwo").children().find("input[type=text]").eq(m)
+                tmpPushMsgDetailContentVal.value = $(domLis).val()
+              }
+              tmpDetailArr.push(tmpPushMsgDetailContentVal)
+            }
+            resultParams.type = paramsJson.type
+            resultParams.data = paramsJson
+          }
+        }
+        for(var s = 0;s < paramsJson.content.details.length;s++){
+          var hasSelect = false
+          if(paramsJson.content.details[s].controlType == 0) {
+            for(let i = 0; i < paramsJson.content.details[s].details.length; i++) {
+              if(paramsJson.content.details[s].details[i].state == '1') {
+                hasSelect = true
+              }
+            }
+          }
+          if(paramsJson.content.details[s].controlType == 2 && paramsJson.content.details[s].value == ''|| paramsJson.content.details[s].controlType == 0 && !hasSelect){
+            that.parent().find(".calculateError").css("display","block");
+            that.parent().find(".calculateResult").html('');
+            return;
+          }
+        }
+        post(config.calculate,resultParams).then((res)=>{
+          var data = res.data
+          if(data.code == 0){
+            var result = data.data;
+            var tmpName = that.parent().find(".calculateName");
+            var deepDetailResultStr = '';
+            for(var v = 0;v < result.result.length;v++){
+              var name = result.result[v].name
+              var text = result.result[v].text
+              deepDetailResultStr+='<p class="result"><span class="calculateName">'+name+'：</span><span class="calculateResult">'+text+'</span></p>'
+            }
+            $('.resultLis').html(deepDetailResultStr)
+            if($(".sureScore").attr("data-type") == 2){
+              var tmpVal = that.parents(".mayResultSelect").find(".calculateResult:last").html()
+              tmpVal && that.parents(".mayResultSelect").find(".makesureResult").html(tmpVal)
+            }
+            that.parent().find(".calculateError").css("display","none")
+          }else{
+            that.parent().find(".calculateError").html(data.msg).css("display","block")
+            that.parent().find(".calculateResult").html('')
+          }
+        })
+      })
+
+}
+
+module.exports = {
+    bindTipsEvent
+}

src/js/promise.js

@@ -30,6 +30,7 @@ const config = {
   information: '/api/data/conceptDetail/getConceptDetail',
   pushScale: '/api/data/push/pushScale',
   pushTreatment: '/api/data/push/pushTreatment',
+  getSysSetInfoDatas: '/api/data/sysSet/getSysSetInfoDatas'
 }
 const imageUrlPrefix = 'http://192.168.2.241:82';
 const getUrlArgObject = function(parm) {  
@@ -70,6 +71,20 @@ const openNewWin = function(url) {
   window.open(url, newinConf.openMode, newWindowLocation)
 }
 
+//判断浏览器是否为Ie8
+const isIe8 = function(){
+  var DEFAULT_VERSION = 8.0;
+  var ua = navigator.userAgent.toLowerCase();
+  var isIE = ua.indexOf("msie")>-1;
+  var safariVersion;
+  if(isIE){
+  safariVersion =  ua.match(/msie ([\d.]+)/)[1];
+  } 
+  if(safariVersion <= DEFAULT_VERSION ) {
+    return true
+  } 
+}
+
 const throttle =  function(fn, threshhold) {
   var timeout
   var start = new Date;
@@ -98,5 +113,6 @@ module.exports = {
   getUrlArgObject,
   imageUrlPrefix,
   throttle,
-  openNewWin
+  openNewWin,
+  isIe8
 }

src/js/util.js

@@ -0,0 +1,38 @@
+const transConf = function(arr) {
+    window.arr = arr;
+    // var arr = [
+    //     {hospitalCode: "A001", sysType: 16, name: "推荐诊断", code: "diagnose_show", value: 1},
+    //     {hospitalCode: "A001", sysType: 16, name: "问诊症状", code: "inquiry_show", value: 1},
+    //     {hospitalCode: "A001", sysType: 16, name: "体格检查", code: "health_show", value: 1},
+    //     {hospitalCode: "A001", sysType: 16, name: "病情提示", code: "illness_show", value: 1},
+    //     {hospitalCode: "A001", sysType: 16, name: "治疗方案", code: "cure_show", value: 1},
+    //     {hospitalCode: "A001", sysType: 16, name: "检验检查", code: "lispacs_show", value: 1},
+    //     {hospitalCode: "A001", sysType: 16, name: "推荐诊断", code: "diagnose_no", value: 7},
+    //     {hospitalCode: "A001", sysType: 16, name: "问诊症状", code: "inquiry_no", value: 1},
+    //     {hospitalCode: "A001", sysType: 16, name: "体格检查", code: "health_no", value: 2},
+    //     {hospitalCode: "A001", sysType: 16, name: "病情提示", code: "illness_no", value: 3},
+    //     {hospitalCode: "A001", sysType: 16, name: "治疗方案", code: "cure_no", value: 6},
+    //     {hospitalCode: "A001", sysType: 16, name: "检验检查", code: "lispacs_no", value: 5},
+    //     {hospitalCode: "A001", sysType: 16, name: "是否对接", code: "connect", value: 1},
+    //     {hospitalCode: null, sysType: 16, name: "警惕诊断", code: "vigilant_show", value: 1},
+    //     {hospitalCode: null, sysType: 16, name: "警惕诊断", code: "vigilant_no", value: 3}
+    // ]
+    const reg = /_show$/g;
+    var newArr = arr.filter(item => item.code.match(reg) && item.value === 1 )
+    for(let i = 0; i < newArr.length; i++) {
+        for (let j = 0; j < arr.length; j++) {
+            if(arr[j].code.match(/_no$/g) && arr[j].code.replace('_no', ' ') === newArr[i].code.replace('_show', ' ')) {
+                newArr[i].orderNo = arr[j].value
+            }
+        }
+    }
+    newArr.sort((a, b) => {
+        return a.orderNo - b.orderNo
+    })
+    return newArr
+}
+
+
+module.exports = {
+    transConf
+}

src/landscape.js

@@ -1,121 +0,0 @@
-require('./css/landscape.css');
-require('./css/reset.css');
-require('./css/popup.css');
-require('./js/popup');
-const $ = require("jquery");
-const { post,config,getUrlArgObject, openNewWin } = require('./js/promise.js');
-
-const {bqtsFun,ybzlFun,cyywFun,tjwzFun,tjtgFun,tjhyFun,tjfjFun, tjzdFun, slideToggle} = require('./js/landscapeDom.js');
-//   symptom: "恶心呕吐腰痛", //胸痛，背痛，恶心，呕吐     //恶心呕吐腰痛   //牙周袋形成
-
-var msg = {
-  age: getUrlArgObject('age'),
-  sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
-  symptom: getUrlArgObject('symptomJson'),
-  vital: getUrlArgObject('vitalJson'),
-  lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
-  pacs: getUrlArgObject('pacsJson'),
-  diag: getUrlArgObject('diagJson'),
-  diseaseName: getUrlArgObject('diagJson'),
-  other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-  hosCode:getUrlArgObject('hospitalCode') || ''
-}//推送相关信息
-
-window.msg = msg
-window.pushMessage = {}
-
-post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
-  var data = res.data
-  if(data.code == 0){
-    $(".diseaseName").html(msg.diag)
-    var result = data.data;
-    var num = 0;
-    if(!!(result.commonTreatment && result.commonTreatment.content)){
-      $(".treatPlanNull").css("display","none")
-      ++num
-      ybzlFun(result.commonTreatment.content)//一般治疗
-    } else {
-      $(".treatPlanNull").css("display","block")
-    }
-    if(!!result.treatment && result.treatment.length>0){
-      $(".treatMedicineNull").css("display","none")
-      ++num
-      cyywFun(result.treatment)//常用药物
-    } else {
-      $(".treatMedicineNull").css("display","block")
-      $(".treatMedicine").css("display","none")
-    }
-    $(".conditionHintZhiliaoAp ").on('click',".slideDown",function(){
-      openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
-    })
-    if(num == 0){
-      $(".conditionHintZhiliaoNull").css("display","block")
-    }
-  }else{
-    $(".treatMedicine").css("display","none")
-    $(".treatPlanNull").css("display","block")
-    $(".treatMedicineNull").css("display","block")
-  }
-})
-
-
-post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((res)=>{
-  var data = res.data
-  if(data.code == 0){
-    
-    var result = data.data;
-    if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
-      window.pushMessage = result.medicalIndications;//计算的需要的相关数据
-      bqtsFun(result.medicalIndications)
-    }
-    if(result.dis){
-      var proB = result.dis['可能诊断'] || []//可能
-      var proY = result.dis['确诊'] || []//确诊
-      var proWaring = result.dis['警惕'] || []
-      tjzdFun(proWaring, 'warning')
-      tjzdFun(proY)
-      tjzdFun(proB)
-      
-      slideToggle($(".conditionHintRecomDiagLis")) 
-      $(".infoMsgParent .infoMsg").on("click",function(){
-        const infoMsgName = $(this).parent().attr('data-name')
-        openNewWin(`information.html?type=7&position=2&name=${infoMsgName}`)
-      })
-      if(proY.length == 0 && proB.length == 0 && proWaring.length == 0){
-        $(".conditionHintRecomDiagLis").css("display","none")
-      }else{
-        $(".conditionHintRecomDiagLisNull").css("display","none")
-      }
-    }
-    if(result.symptom && result.symptom.length > 0){//推荐问诊症状
-      $(".conditionHintWzNull").css("display","none")
-      tjwzFun(result.symptom)
-    }
-    if(result.vital && result.vital.length > 0){//体格检查
-      $(".conditionHintTgNull").css("display","none")
-      tjtgFun(result.vital)
-    }
-    if(result.pacs && result.lab.length > 0){
-      $(".conditionHintAssistLis").css({
-        "border-top":"1px solid #D1D1D1"
-      })
-    }
-    if(result.lab && result.lab.length > 0){//化验
-      $(".conditionHintInspectNull").css("display","none")
-      $(".conditionHintAssistNull").css("display","none")
-      tjhyFun(result.lab)
-    }
-    if(result.pacs && result.pacs.length > 0){//辅检
-      $(".conditionHintInspectNull").css("display","none")
-      $(".conditionHintAssistNull").css("display","none")
-      tjfjFun(result.pacs)
-    }
-  }
-})
-
-$(".disclaimer").on("click",function() {
-  openNewWin("disclaimer.html")
-})
-
-
-

src/landscapePage.js

@@ -1,18 +0,0 @@
-require('./css/landscapePage.css');
-const $ = require("jquery");
-
-var lis = [
-  {
-    detailName: "HGB*3/HCT",
-    maxValue: "",
-    minValue: "",
-    name: "血常规",
-    otherValue: "",
-    source: "0",
-    time: "2019-05-07 17:11",
-    uniqueName: "血常规-HGB*3/HCT",
-    units: "",
-    value: "4"
-  }
-];
-$(".iframeContainer").attr("src",'landscape.html?age=22&lisJson='+JSON.stringify(lis)+'&diagJson=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常, 报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg')

webpack.config.js

@@ -7,16 +7,14 @@ const webpack = require('webpack');
 const proxyHost = "http://192.168.2.236:5050";
 module.exports = {
   entry: {
-    landscapePage: path.resolve(__dirname, 'src', 'landscapePage.js'),
-    landscape: path.resolve(__dirname, 'src', 'landscape.js'),
-    landscapeMedical: path.resolve(__dirname, 'src/js', 'landscapeMedical.js'),
-    index: path.resolve(__dirname, 'src', 'index.js'),
+    index: path.resolve(__dirname, 'src/js', 'index.js'),
     page: path.resolve(__dirname, 'src', 'page.js'),
     information: path.resolve(__dirname, 'src/js', 'information.js'),
     disclaimer: path.resolve(__dirname, 'src/js', 'disclaimer.js'),
     scale: path.resolve(__dirname, 'src/js', 'scale.js'),
     illness: path.resolve(__dirname, 'src/js', 'illness.js'),
     treatplan: path.resolve(__dirname, 'src/js', 'treatplan.js'),
+    indexHorizontal: path.resolve(__dirname, 'src/js', 'indexHorizontal.js'),
     vendor: 'lodash'// 多个页面所需的公共库文件，防止重复打包带入
   },
   output: {
@@ -81,19 +79,6 @@ module.exports = {
         collapseWhitespace: true //删除空白符与换行符
       }
     }),
-    new HtmlWebpackPlugin({
-      title: 'landscapePage',
-      template: path.resolve(__dirname, 'src/html', 'landscapePage.html'),
-      filename: 'landscapePage.html',
-      chunks: ['landscapePage', 'vendor', 'common'],
-      inject: true,
-      hash: true, //防止缓存
-      minify: {
-        removeAttributeQuotes: true, //压缩 去掉引号
-        removeComments: true, //移除HTML中的注释
-        collapseWhitespace: true //删除空白符与换行符
-      }
-    }),
     new HtmlWebpackPlugin({
       title: 'information',
       template: path.resolve(__dirname, 'src/html', 'information.html'),
@@ -146,15 +131,11 @@ module.exports = {
         collapseWhitespace: true //删除空白符与换行符
       }
     }),
-    new MiniCssExtractPlugin({
-      filename: 'css/[name].css',
-      chunkFilename: '[id].css'
-    }),
     new HtmlWebpackPlugin({
-      title: 'landscape',
-      template: path.resolve(__dirname, 'src/html', 'landscape.html'),
-      filename: 'landscape.html',
-      chunks: ['landscape', 'vendor', 'common'],
+      title: 'indexHorizontal',
+      template: path.resolve(__dirname, 'src/html', 'indexHorizontal.html'),
+      filename: 'indexHorizontal.html',
+      chunks: ['indexHorizontal', 'vendor', 'common'],
       inject: true,
       hash: true, //防止缓存
       minify: {
@@ -163,18 +144,9 @@ module.exports = {
         collapseWhitespace: true //删除空白符与换行符
       }
     }),
-    new HtmlWebpackPlugin({
-      title: 'landscapeMedical',
-      template: path.resolve(__dirname, 'src/html', 'landscapeMedical.html'),
-      filename: 'landscapeMedical.html',
-      chunks: ['landscapeMedical', 'vendor', 'common'],
-      inject: true,
-      hash: true, //防止缓存
-      minify: {
-        removeAttributeQuotes: true, //压缩 去掉引号
-        removeComments: true, //移除HTML中的注释
-        collapseWhitespace: true //删除空白符与换行符
-      }
+    new MiniCssExtractPlugin({
+      filename: 'css/[name].css',
+      chunkFilename: '[id].css'
     }),
     new webpack.HotModuleReplacementPlugin(),
     new CleanWebpackPlugin()
@@ -272,6 +244,7 @@ module.exports = {
     proxy: {
       '/api': proxyHost
     },
-    hot: true
+    hot: true,
+    openPage:'index.html?age=28&diseaseId=280&lisJson=&diagJson=急性胰腺炎&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常,%20报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg&hospitalCode=A001'
   }
 }