慢病右侧推送数据添加

src/common/components/ComplexModal/index.less

@@ -14,6 +14,11 @@
     bottom:30px;
     text-align: right;
   }
+  /*@media print {
+    .shade{
+      display: none;
+    }
+  }*/
   .shade {
     position: fixed;
     left: 0;

src/components/AssessResult/ChartItem/index.jsx

@@ -25,7 +25,7 @@ class ChartItem extends Component {
     for(let i=0;i<7;i++){
       temp=i*1000*60*60*24;
       arr.unshift(...this.getDayHours(now-temp));
-    }console.log(arr)
+    }
     return arr;
   }
   getDayHours(time){

src/components/AssessResult/ChooseItem/index.jsx

@@ -21,7 +21,7 @@ class ChooseItem extends Component {
                 <span>{it.name}：</span>
                 <div className={style['row']}>
                   {it.details&&it.details.map((i)=> {
-                    if(it.controltype ==1){
+                    if(it.controltype ==0){
                       return <div className={style['choose-item']}><Radio name={i.detailName} value={i.detailName} handleClick={null}></Radio>{i.state?<i>（智能推荐）</i>:''}</div>;
                     }else{
                       return <span className={style['choose-item']}>

src/components/AssessResult/ScaleItem/index.jsx

@@ -32,6 +32,9 @@ class ScaleItem extends Component {
               <img src={deleteIcon} />
             </div>
           </li>
+          <li>
+            <textarea className={style['edit-row']} name="supplement" id="" rows="6" placeholder='评估描述'></textarea>
+          </li>
         </ul>
       </div>
     </div>;

src/components/AssessResult/index.jsx

@@ -39,11 +39,11 @@ class AssessResult extends Component {
     const name = item.regionName+"：";
     const list = item.data&&item.data.rows;
     switch (+item.regionType){
-      case 0:
+      case 0:     //数据来源与右侧手动添加
         return <ScaleItem title={name} data={list}></ScaleItem>;
-      case 1:
+      case 1:     //数据来源于大数据
         return <ChooseItem title={name} data={list}></ChooseItem>;
-      case 10:
+      case 10:    //数据来源于后台
         return <ChartItem title={name} data={chartData} initFn={getIndexData}></ChartItem>;
       default:
         return '';

src/components/AssessResult/index.less

@@ -43,6 +43,12 @@
       color: #929292;
     }
   }
+  .edit-row{
+    width: 100%;
+    border:1px @placeholder-color solid;
+    border-radius: 4px;
+    padding: 5px;
+  }
   .chart-box{
     display: inline-block;
     width: 49%;

src/components/BodyContainer/index.less

@@ -1,3 +1,8 @@
+/*@media print{
+  .container{
+    display: none;
+  }
+}*/
 .container{
   padding: 50px 10px 0 10px;
   position: relative;

src/components/ChronicInfo/index.jsx

@@ -80,7 +80,6 @@ class ChronicInfo extends React.Component{
     const {hideList} = this.props;
     hideList&&hideList();
   }
-
   render(){
     const footer = <div className={style['footer']}>
       <span className={style['print']}><img src={printIcon} alt=""/>打印</span>

src/containers/AssessResult.js

@@ -7,7 +7,7 @@ import {getAssessData,getIndexData} from '@store/async-actions/fetchModules';
 import {SET_ASSESS_DATA,SET_INDEX_DATA} from '@types/assessResult';
 
 function mapStateToProps(state) {
-  //console.log(state)
+  console.log(state)
   const {assessResult} = state;
   return {
     data:assessResult.data,

src/store/actions/checkBody.js

@@ -496,7 +496,7 @@ export function delSingleLable(state,action){
   return res;
 }
 //查体推送高亮标签
-export function setImportCheckbodyLabel(state,action) {console.log(action)
+export function setImportCheckbodyLabel(state,action) {
   let res = Object.assign({},state);
   res.importLabel = action.labels;
   res.update = Math.random();

src/store/async-actions/pushMessage.js

@@ -1,5 +1,5 @@
 import { get, post, json } from "@utils/ajax";
-import { BILLING_ADVICE, SET_TIPS, SET_TIPS_DETAILS ,SET_CHRONIC_TABLELIST} from '../types/pushMessage';
+import { BILLING_ADVICE, SET_TIPS, SET_TIPS_DETAILS ,SET_CHRONIC_TABLELIST,SET_CHRONIC_PUSHS} from '../types/pushMessage';
 import { SET_CLICK_DIAG } from '../types/diagnosticList';
 import {storageLocal,getEMRParams} from '@utils/tools';
 import {SET_IMPORT_CHECKBODY_LABEL} from "../types/checkBody";
@@ -21,7 +21,7 @@ export const billing = (mdata) => {
   const emrData = getEMRParams();
   const params = {
     age: emrData.age,
-    featureType: "4,5,6,7",
+    featureType: "4,5,6,7,22",
     diag: emrData.dis,
     lis: emrData.lis,
     other: emrData.other,
@@ -32,7 +32,7 @@ export const billing = (mdata) => {
   };
   storageLocal.set('emrParam',params);      //推送数据存储，用作推送前对比是否有变，有变才推送
     json(url, params).then((data) => {
-        let {dis, lab, pacs,markedVitalIds} = data.data.data||{};console.log(markedVitalIds)
+        let {dis, lab, pacs,markedVitalIds,medicalIndications} = data.data.data||{};
         lab = lab||[];
         pacs = pacs||[];
         // console.log('推送数据', data.data.data);
@@ -63,6 +63,11 @@ export const billing = (mdata) => {
             lab: lab||[],
             pacs: pacs||[],
         });
+        //慢病推送模块数据
+        dispatch({
+          type:SET_CHRONIC_PUSHS,
+          data:medicalIndications
+        });
         //查体高亮标签
         dispatch({
           type:SET_IMPORT_CHECKBODY_LABEL,

src/store/reducers/pushMessage.js

@@ -1,4 +1,4 @@
-import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_TIPS_DETAILS, SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS, SET_COMMONTREATMENT, IS_FIRST_MAIN_DIAG, SET_ADVICE_INPUT ,SET_CHRONIC_TABLELIST,SHOW_TABLE_LIST,HIDE_TABLE_LIST} from '../types/pushMessage';
+import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_TIPS_DETAILS, SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS, SET_COMMONTREATMENT, IS_FIRST_MAIN_DIAG, SET_ADVICE_INPUT ,SET_CHRONIC_TABLELIST,SHOW_TABLE_LIST,HIDE_TABLE_LIST,SET_CHRONIC_PUSHS} from '../types/pushMessage';
 import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails, setCommontreatment, isFirstMainDiag, setAdviceInput } from '../actions/pushMessage';
 
 const initState = {
@@ -64,6 +64,9 @@ export default function(state = initState, action) {
     case HIDE_TABLE_LIST://隐藏量表列表数据
       res.showList = false;
       return res;
+    case SET_CHRONIC_PUSHS:
+      res.chronicPushItems = action.data;
+      return res;
     default:
       return state;
   }

src/store/types/pushMessage.js

@@ -18,5 +18,6 @@ export const SET_ADVICE_INPUT = 'SET_ADVICE_INPUT' ; //设置医嘱自由输入
 export const SET_CHRONIC_TABLELIST = 'SET_CHRONIC_TABLELIST' ; //设置量表列表
 export const SHOW_TABLE_LIST = 'SHOW_TABLE_LIST' ; //显示量表列表
 export const HIDE_TABLE_LIST = 'HIDE_TABLE_LIST' ; //隐藏量表列表
+export const SET_CHRONIC_PUSHS ='SET_CHRONIC_PUSHS'; //右侧慢病量表评估推送模块数据
 
 

src/utils/tools.js

@@ -655,7 +655,7 @@ function didPushParamChange(){
   const oldParams = storageLocal.get('emrParam');
   const newParams = JSON.stringify({
     age: emrData.age,
-    featureType: "4,5,6,7",
+    featureType: "4,5,6,7,22",
     diag: emrData.dis,
     lis: emrData.lis,
     other: emrData.other,