|
@@ -6,7 +6,7 @@ import saveHistory from '@common/images/saveHistory.png';
|
|
|
import PrintPreviewContainer from '@containers/PrintPreviewContainer';
|
|
|
import PreviewContainer from '@containers/PreviewContainer';
|
|
|
import { ConfirmModal, Notify } from '@commonComp';
|
|
|
-import {getAllDataList,getAllDataStringList,isAllClear} from '@utils/tools';
|
|
|
+import {getAllDataList,getAllDataStringList,isAllClear,filterArr} from '@utils/tools';
|
|
|
import store from '@store';
|
|
|
|
|
|
|
|
@@ -80,10 +80,7 @@ class Operation extends Component {
|
|
|
keepHistory(){
|
|
|
let baseList = store.getState();
|
|
|
let jsonStr = getAllDataStringList(baseList);
|
|
|
- if(JSON.parse(jsonStr.chief).length == 1 && JSON.parse(jsonStr.chief)[0].trim() ==''){
|
|
|
- Notify.info('主诉不能为空');
|
|
|
- return false;
|
|
|
- }else if(jsonStr.chief && JSON.parse(jsonStr.chief).length < 1){
|
|
|
+ if(filterArr(JSON.parse(jsonStr.chief)) == ''){
|
|
|
Notify.info('主诉不能为空');
|
|
|
return false;
|
|
|
}else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){
|