Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

src/common/js/func.js

@@ -118,6 +118,11 @@ export const fullfillText = (arr,noPre=false,noEnd=false,ifEmpty=true)=>{
         tempText = getSaveText(it);
       }
       saveText.push(tempText);
+      // 模板只有一个标签时第一项后面也要加空标签
+      if(arr.length==1){
+        newArr.push(textLabel);
+        saveText.push('');
+      }
     }else{
       pre = arr[i-1];
       item = !ifEmpty&&cNum<config.showCheckNum?Object.assign({},it,{showInCheck:true}):it;

src/components/AddInspect/index.jsx

@@ -286,7 +286,7 @@ class Inspect extends React.Component {
   render() {
     const { getInfomation,handleChangeValue,inspectVal, list, labelList, delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
     const { toastText, visible, tmpId, tmpIdx } = this.state;
-    console.log(this.props,99999)
+
     return (
       <div className={styles.wrapper}>
         <div className={styles.check}>

src/components/AddInspect/index.less

@@ -127,7 +127,7 @@
 }
 .itemPart {
     height: 28px;
-    // line-height: 28px;
+    line-height: 28px;
     overflow: hidden;
     padding-top: 0 !important;
     width: 330px;
@@ -151,7 +151,7 @@
     }
     .itemPartT {
         float: right;
-        width: 110px;
+        max-width: 110px;
         input {
             width: 40px;
             text-align: center;

src/components/AssessResult/ChartItem/index.jsx

@@ -172,8 +172,13 @@ class Chart extends Component{
         }
       },
       legend: {
+        type:'scroll',
+        /*formatter: function (name) {
+          return name.split("-")[name.split("-").length-1];
+        },*/
         data:names,
-        bottom:210
+        padding:0,
+        itemHeight:16,
       },
       grid:{
         top:80

src/components/Information/index.less

@@ -3,6 +3,7 @@
   font-size: 24px;
   margin-bottom: 30px;
   text-align:center;
+  padding-top: 15px;
 }
 .patInfo {
   margin: 0px 0px 30px 0px;

src/components/Preview/index.less

@@ -22,14 +22,20 @@
     bottom: 7%;
     height: 86%;
     overflow: hidden;
+    padding-top: 45px;
   }
   .close { 
-    padding:  15px 15px 15px 20px;
+    padding:  0 15px;
+    height: 45px;
+    line-height: 45px;
     border-bottom: 1px solid #EAEDF1;
+    position: absolute;
+    width: 100%;
+    top: 0;
     img{
       float:right;
       cursor: pointer;
-      margin-top: -5px;
+      margin-top: 10px;
     }
   }
 }

src/components/PreviewBody/index.less

@@ -5,7 +5,7 @@
   height: 100%;
   top:0px;
   width: 820px;
-  padding: 15px 0px 100px 0px;
+  padding-bottom: 100px;
   box-sizing: border-box;
   .contents {
     position: relative;

src/components/PrintPreview/index.less

@@ -22,14 +22,20 @@
       bottom: 7%;
       height: 86%;
       overflow: hidden;
+      padding-top: 45px;
     }
     .close { 
-      padding:  15px 15px 15px 20px;
+      padding:  0 15px;
+      height: 45px;
+      line-height: 45px;
       border-bottom: 1px solid #EAEDF1;
+      position: absolute;
+      width: 100%;
+      top: 0;
       img{
         float:right;
         cursor: pointer;
-        margin-top: -5px;
+        margin-top: 10px;
       }
     }
     .button {

src/components/ScaleTable/index.jsx

@@ -240,7 +240,8 @@ class ScaleTable extends React.Component{
                 return <div className={style['group']}>
                   <p className={style['groupName']}>{v.groupName}</p>
                   {v.rows&&v.rows.map((it,ind)=>{
-                    return <div style={{borderBottom:'1px solid #EBEBEB'}}>
+                    return <div className={style['rows']}>
+                        {it.required==1&&it.row.length>1?<span className={style['tip']}>本组选项可多选或根据需要选择某一条选项</span>:''}
                       {it.row.map((item,index)=>{
                         if(item.controlType==0){
                           return <div className={style['block']} style={{border:it.required==1&&!item.isSelect&&start?'1px solid #f00':'none'}}>

src/components/ScaleTable/index.less

@@ -53,6 +53,16 @@ strong{
     color:#000;
     margin: 25px 0;
   }
+  .rows{
+    border-bottom: 1px solid #EBEBEB;
+    position: relative;
+    .tip{
+      position: absolute;
+      top:-16px;
+      color: #c9c9c9;
+      font-size: 12px;
+    }
+  }
   .subTotal{
     height: 49px;
     line-height: 49px;

src/containers/AssistCheck.js

@@ -8,7 +8,7 @@ import { getSearchList,getInstroduce } from '@store/async-actions/assistCheck';
 import {ISREAD} from '@store/types/homePage.js';
 import {billing} from '@store/async-actions/pushMessage';
 
-function mapStateToProps(state) {//console.log(state)
+function mapStateToProps(state) {console.log(state)
     return {
         list:state.assistCheck.list,
         assistLabel:state.assistCheck.assistLabel,

src/store/actions/currentIll.js

@@ -147,8 +147,8 @@ export const setData = (state,action) =>{
   }
   
   if (useEmpty) {
-    // res.data = res.emptyData;
-    res.data = res.emptyData&&res.emptyData.length>0?JSON.parse(JSON.stringify(res.emptyData)):moduleData;
+    const data = res.emptyData?JSON.parse(JSON.stringify(res.emptyData)):[];
+    res.data = fullfillText(data).newArr;
   } else {
     if(mainData&&mainData.length>0){//主诉使用模板
       // 目前只需要将第一个主诉病程移植到现病史
@@ -351,7 +351,7 @@ export const confirm = (state,action) =>{
   let res = Object.assign({},state);
   let length1 = res.data.length;
   let arr = JSON.parse(JSON.stringify(res.data));
-  const {nones,exists,withs,ikey,exclusion,excluName,ban,noneIds} = action.data;console.log(111,action)
+  const {nones,exists,withs,ikey,exclusion,excluName,ban,noneIds} = action.data;
   let existsId = exists && exists.length>0?getIds(exists):[];
   let withsId = withs && withs.length>0?getIds(withs):[];
   res.symptomIds = res.symptomIds.concat(existsId,withsId,noneIds);//搜索去重
@@ -620,7 +620,8 @@ export const changeLabelVal = (state,action)=>{
   }else{//删除完标签内容则删除该标签
     const num = nextIsDot?2:1;
     res.data.splice(index,num);
-    res.saveText = fullfillText(res.data).saveText;
+    res.saveText.splice(index,num);
+    // res.saveText = fullfillText(res.data).saveText;
   } 
   res.update = Math.random();
   return res;
@@ -651,7 +652,8 @@ export const changeNumLabelVal = (state,action)=>{
   }else{//删除完标签内容则删除该标签
     const num = nextIsDot?2:1;
     res.data.splice(index,num);
-    res.saveText = fullfillText(res.data).saveText;
+    res.saveText.splice(index,num);
+    // res.saveText = fullfillText(res.data).saveText;
   }
   res.update = Math.random();
   return res;
@@ -746,7 +748,7 @@ export function insertLabelData(state,action){
     let resData = JSON.parse(JSON.stringify(res.data));
     resData.splice(focusIndex,1,text,...(FilteredDotMapping2));
     res.data = fullfillText(resData).newArr;
-    res.saveText[focusIndex] = searchData;
+    res.saveText = fullfillText(res.data).saveText;
   }else{
     let resData;
     const searchStr = res.searchStr;
@@ -915,7 +917,6 @@ export function removeId(state,action){
     data[index].name = text;
     data[index].value = text;
   }
-  //console.log(345,action,res);
   res.update = Math.random();
   return res;
 }
@@ -924,7 +925,7 @@ export function removeId(state,action){
 export function multipleComfirn(state,action){
   let res = Object.assign({},state);
   const {ikey,seleData,fullIkey} = action.data;
-  let data = res.data;//console.log(action,data[ikey])
+  let data = res.data;
   let index = fullIkey.substr(fullIkey.length-1,1);
   if(data[ikey].tagType==3){    //在组合项中
     let item = data[ikey].questionMapping;

src/store/async-actions/fetchModules.js

@@ -259,7 +259,7 @@ export function getIndexData(range){
     const param = {
       diseaseId:21773,
       startTime:range[0],
-      endTime:range[1],
+      endTime:range[1]+" 23:23:59",
       patientId:patInfo.message.patientId,
     };
     return json(api.getIndexData,param);

src/store/reducers/inspect.js

@@ -355,4 +355,5 @@ function getPushLists(data1,data2){     //推送数据
     })
     totalTmpArr = tmpArr1.concat(tmpArr2);
     return totalTmpArr;
-}
+}
+

src/utils/tools.js

@@ -877,7 +877,6 @@ function inspectAndAssist(){
       questionId: '',
       showType: 1,
     }
-    console.log(tmpInspect[i])
     if (tmpInspect[i].controlType == 0) {
       tmpDetail = tmpInspect[i].questionMapping
     }else if(tmpInspect[i].controlType == 1 || tmpInspect[i].controlType == 6){