模板参数和预问诊列表参数修改

src/components/PreviewBody/Inspect/index.jsx

@@ -3,7 +3,6 @@ import { normalVal,getStatusImg } from '@utils/tools';
 
 const PreviewInspect = (props) => {
   const { dataJson, toTime ,dateTime,showDetails  } = props;
-  console.log(dataJson)
     return <tr className={style['patInfoFst']}>
       <td className={style['patInfoSec']}>化验：</td>
       <td className={style['patInfoSec']}>
@@ -37,10 +36,10 @@ const PreviewInspect = (props) => {
             return <table style={{ margin: '8px 0', width: '100%' }}>
               {
                 item.show?<tr className={style.assistTableTrFst}>
-                  <td>
+                  <td className={style.ediName}>
                     <span> {item.name} </span> 
                     <p>
-                      {item.inpValue}
+                      ({item.inpValue})
                       <i></i>
                     </p>
                     </td>

src/components/PreviewBody/index.less

@@ -82,6 +82,9 @@ table{
 .assistTableTrFst {
   font-size: 14px;
   line-height: 1.5;
+  .ediName {
+    width: 100%;
+  }
   span {
     border-bottom: 1px solid #666666;
   }

src/components/TemplateItems/TemplateItem/index.jsx

@@ -213,7 +213,7 @@ class TemplateItem extends React.Component {
   render() {
     const { allCheckShow, id, name, preview,conceptDeptName, sex,admin,checkItemsAdmin,allCheckShowAdmin,adminflg } = this.props;
     let previewJson = JSON.parse(preview);
-    let sexStr = sex == 2 ? ' (女'+(conceptDeptName&&admin?'-'+conceptDeptName:'')+')' : sex == 1 ? ' (男'+(conceptDeptName&&admin?'-'+conceptDeptName:'')+')' : ' (通用'+(conceptDeptName&&admin?'-'+conceptDeptName:'')+')';
+    let sexStr = sex == 2 ? ' (女'+(conceptDeptName&&'-'+conceptDeptName)+')' : sex == 1 ? ' (男'+(conceptDeptName&&'-'+conceptDeptName)+')' : ' (通用'+(conceptDeptName&&'-'+conceptDeptName)+')';
     return (
       <div className={style.wrapper}>
         <div className={this.getStyleFst()}

src/components/TemplateItems/index.jsx

@@ -81,7 +81,7 @@ class TemplateItems extends React.Component {
     }
     templateSearch(){
         const {templateSearch} = this.props
-        templateSearch(this.$search.current.value)
+        templateSearch((this.$search.current.value).trim())
         if(this.$search.current.value.trim()){
             this.setState({
                 msg:'暂无模板信息'

src/store/async-actions/preIcss.js

@@ -7,22 +7,12 @@ import {Notify} from '@commonComp';
 
 export const getPreMsg = () => {
     let baseList = store.getState().patInfo.message;
-    const inCode = config.preIcss.recordIdVal===-1?getUrlArgObject("recordId"):config.preIcss.recordIdVal;
     json('/api/prec/inquiryInfo/hisInquirys', {
         "isHaveDetail":1,
         "hospitalCode": baseList.hospitalCode,
-        "inquiryCode":inCode,
-        "patientCode": baseList.patientCode,
         "dayLimit":config.preIcss.deadline===-1?undefined:config.preIcss.deadline,
-
-        // "doctorCode": baseList,
-        // "doctorId": baseList.doctorId,
-        // "hospitalDeptCode": baseList.hospitalDeptCode,
-        // "hospitalDeptId": baseList.hospitalDeptId,
-        // "hospitalId": baseList.hospitalId,
-        // "patientId": baseList.patientId,
-        // "patientIdNo": baseList.patientIdNo,
-        // "patientName": baseList.patientName
+        "patientIdNo": baseList.patientIdentityNum?baseList.patientIdentityNum:baseList.patientIdNo,
+        "patientName": baseList.patientName
     },true).then((res) => {
         const data = res.data;
         if (data.code == 0) {
@@ -40,13 +30,15 @@ export const getPreMsg = () => {
 }
 
 export const tellPred = () => {
-    let baseList = store.getState().homePage.item;
+    let baseData = store.getState();
+    let baseList = baseData.homePage.item;
+    let idcon = baseData.patInfo.message;
     const inCode = config.preIcss.recordIdVal===-1?getUrlArgObject("recordId"):config.preIcss.recordIdVal;
     json('/api/prec/inquiryInfo/inquiryQuoteForIcss', {
         "hospitalCode": baseList.hospitalCode,
         "inquiryCode":inCode,
         "patientCode": baseList.patientCode,
-
+        "patientIdentityNum":idcon.patientIdentityNum,
         "doctorCode":baseList.doctorCode,
         "doctorId": baseList.doctorId,
         "doctorName":baseList.doctorName,

src/store/async-actions/tabTemplate.js

@@ -40,7 +40,7 @@ export const initCommonItemList = (current,name) => { //初始化数据
   return (dispatch) => {
     axios.json('/templateInfo/getTemplatePageAlls', {
       "doctorId": state.doctorId,
-      "hospitalDeptId": state.hospitalDeptId,
+      "hospitalDeptId": (name == '')?state.hospitalDeptId:null,
       "hospitalId": state.hospitalId,
       "hospitalCode": state.hospitalCode,
       "current": current,