6 年之前 · 3b882867e4
--- a/src/common/js/func.js
+++ b/src/common/js/func.js
@@ -79,11 +79,13 @@ function notTextLabel(label){
 
				 * 入参：arr源数组，
			
 
				 *       noPre是否不添加前置文本标签，默认false即添加
			
 
				 *       noEnd是否不添加后置文本标签，默认false即添加
			
 
				+*       ifEmpty是否添加空标签，默认true即添加，传false添加逗号，如查体
			
 
				 * */
			
 
				-export const fullfillText = (arr,noPre=false,noEnd=false)=>{
			
 
				+export const fullfillText = (arr,noPre=false,noEnd=false,ifEmpty=true)=>{
			
 
				   let newArr =[],
			
 
				       pre={},
			
 
				       textLabel={},
			
 
				+      _textLabel={},
			
 
				       notText = true,
			
 
				       saveText=[],
			
 
				       tempText = '',
			
@@ -92,6 +94,7 @@ export const fullfillText = (arr,noPre=false,noEnd=false)=>{
 
				     notText = notTextLabel(it);
			
 
				     value = it.value||'';
			
 
				     textLabel = JSON.parse(config.textLabel);
			
 
				+    _textLabel = JSON.parse(config._textLabel);
			
 
				     if(i===0){
			
 
				       //第一个标签不是文本标签时在前面添加文本标签
			
 
				       if(!noPre&&notText){
			
@@ -106,7 +109,8 @@ export const fullfillText = (arr,noPre=false,noEnd=false)=>{
 
				       pre = arr[i-1];
			
 
				       //如果本身不是文本标签且前面一个也不是文本标签,该标签前面添加文本标签
			
 
				       if(notTextLabel(pre)&&notText){
			
 
				-          newArr.push(textLabel,it);
			
 
				+          // newArr.push(textLabel,it);
			
 
				+          ifEmpty?newArr.push(textLabel,it):newArr.push(_textLabel,it);
			
 
				           tempText = value?it.labelPrefix+value+it.labelSuffix:'';
			
 
				           saveText.push("",tempText); 
			
 
				         //最后一个非文本标签，后面添加一个文本标签
			
@@ -130,6 +134,7 @@ export const fullfillText = (arr,noPre=false,noEnd=false)=>{
 
				   return {newArr,saveText};
			
 
				 };
			
 
				 
			
 
				+
			
 
				 //获取标签index,入参：病例项index+标签index+标签内index
			
 
				 export const getLabelIndex = (index)=>{
			
 
				   let ikey = '';
			
--- a/src/common/js/util.js
+++ b/src/common/js/util.js
@@ -32,4 +32,5 @@ export const setLastPosition=(dom)=>{
 
				 //         range.collapse(false);//光标移至最后
			
 
				 //         range.select();
			
 
				 //     }
			
 
				-// }
			
 
				+// }
			
 
				+
			
--- a/src/common/less/variables.less
+++ b/src/common/less/variables.less
@@ -46,7 +46,7 @@
 
				 @selected-bg:#fff;
			
 
				 
			
 
				 /*********推送内容容器宽度*************/
			
 
				-@push-width: 460px;
			
 
				+@push-width: 450px;
			
 
				 /****电子病历容器宽度*****/
			
 
				 @EMR-width: calc(~"100% - "@push-width);
			
 
				 
			
--- a/src/components/PushItems/index.jsx
+++ b/src/components/PushItems/index.jsx
@@ -95,7 +95,6 @@ class PushItems extends Component {
 
				       showAdd,
			
 
				       showTips
			
 
				     } = this;
			
 
				-    // console.log('tipsDiscalimer', tipsDiscalimer)
			
 
				     let assayNum = 0;
			
 
				     let assayHide = assay.map((item, index) => {
			
 
				       assayNum = assayNum + item.name.length + 2;
			
--- a/src/components/PushItems/index.less
+++ b/src/components/PushItems/index.less
@@ -1,12 +1,12 @@
 
				 @import "~@less/variables.less";
			
 
				 .push-content-wrapper{
			
 
				   // padding-top: 50px;
			
 
				-  padding: 0px 20px;
			
 
				+  padding: 0px 15px;
			
 
				   line-height: 20px; 
			
 
				-  width: 460px;
			
 
				+  width: @push-width;
			
 
				   overflow: hidden;
			
 
				   .push-content {
			
 
				-    width: 480px;
			
 
				+    width: 467px;
			
 
				     overflow-y: scroll;
			
 
				   }
			
 
				   .vigilant{
			
@@ -55,7 +55,7 @@
 
				         }
			
 
				       }
			
 
				       div{
			
 
				-        font-size: 12px;
			
 
				+        font-size: 14px;
			
 
				         padding:6px 15px;
			
 
				         span{
			
 
				           cursor: pointer;
			
@@ -66,7 +66,7 @@
 
				   .show {
			
 
				     float: right;
			
 
				     color:  #58ACD7;;
			
 
				-    font-size: 12px;
			
 
				+    font-size: 14px;
			
 
				     cursor: pointer;
			
 
				     img {
			
 
				       width: 12px;
			
@@ -77,7 +77,7 @@
 
				     float: right;
			
 
				     text-align: right;
			
 
				     color: #58ACD7;
			
 
				-    font-size: 12px;
			
 
				+    font-size: 14px;
			
 
				     cursor: pointer;
			
 
				     clear: both;
			
 
				     img {
			
@@ -120,7 +120,7 @@
 
				       }
			
 
				     }
			
 
				     div{
			
 
				-      font-size: 12px;
			
 
				+      font-size: 14px;
			
 
				       padding:6px 15px;
			
 
				       ul{
			
 
				         .firstLi{
			
@@ -142,14 +142,14 @@
 
				             padding: 0px 0px 0px 0px;
			
 
				             margin-top: -2px;
			
 
				             span{
			
 
				-              font-size: 12px;
			
 
				-              line-height: 12px;
			
 
				+              font-size: 14px;
			
 
				+              line-height: 14px;
			
 
				               display: inline-block;
			
 
				               margin: 6px;
			
 
				               input[type='checkbox']{
			
 
				                 float: left;
			
 
				-                width: 12px;
			
 
				-                height: 12px;
			
 
				+                width: 14px;
			
 
				+                height: 14px;
			
 
				                 margin-right: 2px;
			
 
				                 background-color: #fff;
			
 
				                 -webkit-appearance:none;
			
@@ -183,7 +183,7 @@
 
				       }
			
 
				     }
			
 
				     .content{
			
 
				-      font-size: 12px;
			
 
				+      font-size: 14px;
			
 
				       padding:6px 15px;
			
 
				       .title {
			
 
				         font-size: 14px;
			
@@ -191,7 +191,7 @@
 
				         margin-bottom:10px;
			
 
				         a{
			
 
				           display: inline-block;
			
 
				-          font-size: 12px;
			
 
				+          font-size: 14px;
			
 
				           color: #3B9ED0;
			
 
				           width: 42px;
			
 
				           /*height: 20px;
			
@@ -210,7 +210,7 @@
 
				           border: 1px solid #3B9ED0;
			
 
				           border-radius: 4px;
			
 
				           text-align: center;
			
 
				-          font-size: 12px;
			
 
				+          font-size: 14px;
			
 
				           color: #3B9ED0;
			
 
				           line-height: 18px;
			
 
				           margin: 0 10px -2px;
			
--- a/src/components/TemplateItems/index.jsx
+++ b/src/components/TemplateItems/index.jsx
@@ -68,7 +68,7 @@ class TemplateItems extends React.Component {
 
				                             <span className={`${style['fr-element']} ${style['manger']}`} onClick={handleMangerTemplate}>管理</span>
			
 
				                     </div>) : null
			
 
				                 }
			
 
				-                <div style={{width:'460px',overflow:'hidden'}}>
			
 
				+                <div style={{width:'450px',overflow:'hidden'}}>
			
 
				                     <div className={style.tempLists} ref={this.$cont}>
			
 
				                         {
			
 
				                             this.genItems().length > 0?this.genItems():
			
--- a/src/components/TemplateItems/index.less
+++ b/src/components/TemplateItems/index.less
@@ -7,7 +7,7 @@
 
				     .tempLists {
			
 
				         overflow-y: scroll;
			
 
				         background-color: #fff;
			
 
				-        width: 475px;
			
 
				+        width: 466px;
			
 
				         // &::-webkit-scrollbar {
			
 
				         //     display: none;
			
 
				         // }
			
--- a/src/components/Treat/index.jsx
+++ b/src/components/Treat/index.jsx
@@ -40,13 +40,16 @@ class Treat extends Component {
 
				     render(){
			
 
				         const { generalTreat, treatment, surgeryTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title} = this.props;
			
 
				         return(
			
 
				-        <div className={style['treat-mask']}>
			
 
				+        <div>
			
 
				+            <div className={style['treat-mask']}>
			
 
				+            </div>
			
 
				+
			
 
				             <div  id='treatWrapper' className={style['treat-wrapper']}>
			
 
				                 
			
 
				                 <div className={style['treat-box']}>
			
 
				                     <p className={style['treat-title']}>治疗方案 <img onClick={this.hideTreat} src={close}/></p>
			
 
				                     <div className={style['treat-inner-box']}>
			
 
				-                        <GeneralTreat icon={generalIcon} title='一般治疗' titleBg='rgba(47,199,156,0.1)' filter='progid:DXImageTransform.Microsoft.gradient(startColorstr=#192FC79C,endColorstr=#192FC79C)' generalTreat={generalTreat}></GeneralTreat>
			
 
				+                        <GeneralTreat icon={generalIcon} title='一般治疗'   generalTreat={generalTreat}></GeneralTreat>
			
 
				                         <DrugTreat treatment={ treatment } 
			
 
				                                 selectDrug={selectDrug} 
			
 
				                                 setOtherRecommend={ setOtherRecommend } 
			
@@ -71,8 +74,10 @@ class Treat extends Component {
 
				                 </TreatDesc>}
			
 
				                 {showDrug && drugInfo && <DrugInfo drugInfo = {drugInfo} hideDrugInfo = {hideDrugInfo}></DrugInfo>}
			
 
				             </div>
			
 
				+                
			
 
				             
			
 
				         </div>
			
 
				+        
			
 
				         )
			
 
				     }
			
 
				 }
			
--- a/src/components/Treat/index.less
+++ b/src/components/Treat/index.less
@@ -9,15 +9,19 @@
 
				     height: 680px;
			
 
				     margin-left: -340px;
			
 
				     margin-top: -340px;
			
 
				+    z-index: 301;
			
 
				 }
			
 
				 .treat-mask {
			
 
				     position: fixed;
			
 
				-    background: rgba(0, 0, 0, 0.5);
			
 
				     width: 100%;
			
 
				     height: 100%;
			
 
				     top: 0;
			
 
				     left: 0;
			
 
				-    z-index: 9999;
			
 
				+    z-index: 300;
			
 
				+    background: #000;
			
 
				+    opacity: 0.6;
			
 
				+    filter:alpha(opacity=60);
			
 
				+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=60);";
			
 
				 }
			
 
				 .treat-box {
			
 
				     width: 680px;
			
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -19,6 +19,7 @@ export default {
 
				     },
			
 
				     textId:'text',        //自由文本标签的id,
			
 
				     textLabel:'{"tagType":"8","id":"","name":""}',
			
 
				+    _textLabel:'{"tagType":"8","id":"","name":","}',//查体每个标签后面加逗号（1-29）
			
 
				     tagType:"8",
			
 
				     tongYId:7,      //主诉通用特征描述id
			
 
				     addSId:8,      //主诉添加症状id
			
--- a/src/store/actions/checkBody.js
+++ b/src/store/actions/checkBody.js
@@ -30,6 +30,7 @@ export function setNumberValue(state,action){
 
				     });
			
 
				     res.saveText[labelInx] = hasValue?sub.join(''):'';
			
 
				   }
			
 
				+  res.saveText = fullfillText(res.data).saveText;
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
@@ -75,6 +76,7 @@ export function setRadioValue(state,action){console.log(221)
 
				     });
			
 
				     res.saveText[labelInx] = hasValue?sub.join(''):'';
			
 
				   }
			
 
				+  res.saveText = fullfillText(res.data).saveText;
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
@@ -117,6 +119,7 @@ export function setCheckBoxValue(state,action) {
 
				   res.data[labelInx].value = showText;
			
 
				   res.saveText[labelInx] = showText;
			
 
				   res.selecteds[labelInx] = action.data;
			
 
				+  res.saveText = fullfillText(res.data).saveText;
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/currentIll.js
+++ b/src/store/actions/currentIll.js
@@ -85,6 +85,7 @@ export const setData = (state,action) =>{
 
				     let tongYong = "";
			
 
				     let main = [];//主症状
			
 
				     let withs = [];//伴随
			
 
				+    let firstT = 0;
			
 
				     for(let i=0; i<mainData.length; i++){
			
 
				         if(mainData[i].id==config.tongYId && !mainData[i].pos){//第一个通用特征描述
			
 
				           if(mainData[i].value){
			
@@ -98,7 +99,8 @@ export const setData = (state,action) =>{
 
				         // 处理时间和主诉通用症状--现病史模板无“主诉通用症状” 1-7
			
 
				         for(let j=0; j<current.length; j++){
			
 
				           if(mainData[i].id==current[j].id && mainData[i].controlType==5){//处理时间，避免手动输入的值
			
 
				-            if(mainData[i].value){
			
 
				+            firstT++
			
 
				+            if(mainData[i].value && firstT==1){
			
 
				               current[j] = {id:mainData[i].id,name:mainData[i].value,value:mainData[i].value,tagType:config.tagType}
			
 
				             }
			
 
				           }  
			
--- a/src/store/actions/pushMessage.js
+++ b/src/store/actions/pushMessage.js
@@ -190,7 +190,7 @@ export const addBilling = (state, action) => {
 
				 		}
			
 
				 	}
			
 
				 	if(res.advice.assay  && res.advice.check !== '') {
			
 
				-			if(res.advice.assay.substring(res.advice.assay.length-2,res.advice.assay.length-1) !== ', ') {
			
 
				+			if(res.advice.assay.substring(res.advice.assay.length-2,res.advice.assay.length-1) !== ',') {
			
 
				 				res.advice.assay = res.advice.assay + ', '
			
 
				 			} 
			
 
				 	}
			
--- a/src/store/async-actions/diagnosticList.js
+++ b/src/store/async-actions/diagnosticList.js
@@ -4,12 +4,17 @@ import {ISREAD} from "../types/homePage";
 
				 export const isAddMainSuit = () =>{
			
 
				     return (dispatch, getState) => {
			
 
				         const state = getState();
			
 
				+        console.log('state',state);
			
 
				         if(state.diagnosticList.diagnosticList.length === 1 && state.diagnosticList.diagnosticList[0].type === 2) {
			
 
				-            
			
 
				-            if(state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 &&  state.mainSuit.saveText[0] === '')) {
			
 
				-              dispatch({
			
 
				-                type:ISREAD
			
 
				-              });
			
 
				+            const isAddMainSuitFlag = state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText    //判断主诉和化验查体是否为空
			
 
				+                                      && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 
			
 
				+                                      &&  state.mainSuit.saveText[0] === '') && state.assistCheck && state.assistCheck.dataString.length === 0
			
 
				+                                      && state.inspect.labelList && state.inspect.labelList.length === 0
			
 
				+                                    
			
 
				+            if(isAddMainSuitFlag) {
			
 
				+                dispatch({
			
 
				+                    type:ISREAD
			
 
				+                });
			
 
				                 dispatch({
			
 
				                     type: SET_DIAG_TO_MAINSUIT,
			
 
				                     data: state.diagnosticList.diagnosticStr
			
--- a/src/store/async-actions/fetchModules.js
+++ b/src/store/async-actions/fetchModules.js
@@ -1,6 +1,6 @@
 
				 import {json} from '@utils/ajax.js';
			
 
				 import {SET} from '@types/checkBody.js';
			
 
				-import {fullfillText} from '@common/js/func';
			
 
				+import {fullfillText,_fullfillText} from '@common/js/func';
			
 
				 import {SETDATA} from '@store/types/otherHistory';
			
 
				 import store from '@store';
			
 
				 import {getEMRParams} from '@utils/tools.js';
			
@@ -103,7 +103,7 @@ export function getInitData(){
 
				       if(+res.data.code === 0){
			
 
				         const data = res.data.data&&res.data.data.vital;
			
 
				         const str = JSON.stringify(data);
			
 
				-        const arr = fullfillText(JSON.parse(str)).newArr;
			
 
				+        const arr = fullfillText(JSON.parse(str),false,false,false).newArr;
			
 
				         dispatch({
			
 
				           type:SET,
			
 
				           data:[...arr]
			
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -474,23 +474,36 @@ function filterArr(arr){
 
				     return tmpArr.join("").replace(/\s/g,'');
			
 
				 }
			
 
				 
			
 
				-function filterDataArr(arr){   //数据处理
			
 
				+function filterDataArr(arrTmp){   //数据处理
			
 
				     let tmpArr = [];
			
 
				+    let arr = arrTmp.join('').split('');
			
 
				     for(let i = 0;i < arr.length;i++){
			
 
				         if(arr[i] && arr[i].indexOf('undefined') == -1){
			
 
				             if(tmpArr[tmpArr.length-1] != '，' && tmpArr[tmpArr.length-1] != ',' ){
			
 
				                 tmpArr.push(arr[i])
			
 
				             }else if((tmpArr[tmpArr.length-1] == '，' && (arr[i] != '，' || arr[i] != ',')) || (tmpArr[tmpArr.length-1] == ',' && (arr[i] != ',' || arr[i] != ','))) {
			
 
				-              if(arr[i] == '。'){
			
 
				+              if(arr[i] == '。'){     //前面逗号后面句号 [',','。']
			
 
				                 tmpArr.pop();
			
 
				                 tmpArr.push(arr[i]);
			
 
				+              }else if(tmpArr[tmpArr.length-2] == '。' && (tmpArr[tmpArr.length-1] == '，' || tmpArr[tmpArr.length-1] == ',')){//前面句号后面逗号 ['。',',']
			
 
				+                tmpArr.pop();
			
 
				+                tmpArr.push(arr[i]);
			
 
				+              }else if(arr[i] == ',' || arr[i] == '，'){    //  中英文逗号交替[',','，']
			
 
				+                tmpArr.pop();
			
 
				+                tmpArr.push(arr[i]);
			
 
				+              }else if(arr[i] == '、'){    //前面逗号后面句号 [',','、']
			
 
				+                tmpArr.pop();
			
 
				+                tmpArr.push(arr[i]);
			
 
				+              }else if(tmpArr[tmpArr.length-2] == '、' && (tmpArr[tmpArr.length-1] == '，' || tmpArr[tmpArr.length-1] == ',')){    //前面逗号后面句号 ['、',',']
			
 
				+                tmpArr.splice(tmpArr.length-2,1);
			
 
				+                tmpArr.push(arr[i]);
			
 
				               }else{
			
 
				                 tmpArr.push(arr[i]);
			
 
				               }
			
 
				             }
			
 
				         }
			
 
				     }
			
 
				-    return (tmpArr.join('')).replace(/,^|，^|,$|，$/gi,"");
			
 
				+    return (tmpArr.join('')).replace(/^,+/,"").replace(/,+$/,"").replace(/，+$/,"").replace(/，+$/,"");
			
 
				 }
			
 
				 // 取消默认行为
			
 
				 function preventDefault(event) {