Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

src/components/AssessResult/index.jsx

@@ -57,7 +57,7 @@ class AssessResult extends Component {
     }
     if(isList){         //删除全部量表中的项目
       const items = [...this.state.wholeScaleItems];
-      items.splice(i,1);
+      items[i]=null;
       this.setState({
         wholeScaleItems: items,
         addedScaleIds:ids

src/components/ChronicInfo/index.jsx

@@ -262,7 +262,7 @@ class ChronicInfo extends React.Component{
     if(flag){     //有结果
       if(j!==undefined){
         reCheck = addedScaleIds.includes(v.details[j].content.id);      //列表中是否加入同一量表
-        btn = indexs[i]&&indexs[i].includes(j)||reCheck?<span className={style["add-record"]}>
+        btn = (indexs[i]&&indexs[i].includes(j))||reCheck?<span className={style["add-record"]}>
                    <img src={added} />
                    已加入
                  </span>:<span className={style["listResult"]} onClick={()=>this.handleAddAssessItem(v,i,j)}>
@@ -271,7 +271,7 @@ class ChronicInfo extends React.Component{
                  </span>;
       }else{
         reCheck = addedScaleIds.includes(v.id);         //推送中是否加入同一量表
-        btn = wholeScaleItems&&wholeScaleItems[i]||reCheck?<span className={style["add-record"]}>
+        btn = (wholeScaleItems&&wholeScaleItems[i])||reCheck?<span className={style["add-record"]}>
                    <img src={added} />
                    已加入
                  </span>:<span className={style["listResult"]} onClick={()=>addScaleItems(v,i)}>

src/components/DiagnosticList/index.jsx

@@ -16,6 +16,7 @@ import iconRadioActive from '@common/images/icon-radio-active.png'
 import AssessResult from '@containers/AssessResult';
 import tableIcon from '@common/images/table.png';
 import { CONFIRM_TYPE } from "@store/types/typeConfig";
+import $ from "jquery";
 
 class DiagnosticList extends Component {
     constructor(props) {
@@ -45,6 +46,16 @@ class DiagnosticList extends Component {
         this.referCase = this.referCase.bind(this);
         this.handleSaveAssess = this.handleSaveAssess.bind(this);       //评估弹窗确定
         this.handleSavePossible = this.handleSavePossible.bind(this);
+        this.onPrint = this.onPrint.bind(this);
+    }
+    onPrint() {
+      let dom = $("#AssistResult");
+      dom.jqprint({
+        debug: false,
+        importCSS: true,
+        printContainer: true,
+        operaSupport: false,
+      });
     }
     upDiagnostic(index) {
         const { upDiagnostic } = this.props;