临床其他建单接口联调

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.241",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/other-auto/other-auto.component.html

@@ -14,18 +14,20 @@
         <thead>
           <tr class="thead">
             <th nzWidth="20%">自动建单名称</th>
-            <th nzWidth="20%">班次</th>
-            <th nzWidth="20%">任务类型</th>
-            <th nzWidth="20%">是否起始建单</th>
+            <th nzWidth="10%">班次</th>
+            <th nzWidth="30%">任务类型</th>
+            <th nzWidth="10%">是否起始建单</th>
+            <th nzWidth="10%">是否自动建单</th>
             <th nzWidth="20%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
-            <td>{{ data.name || '' }}</td>
-            <td>{{ data.deptDTO ? data.deptDTO.dept : '' }}</td>
-            <td>{{ data.code || '' }}</td>
-            <td>{{ data.code || '' }}</td>
+            <td>{{ data.title || '' }}</td>
+            <td>{{ data.classDTO ? data.classDTO.name : '' }}</td>
+            <td>{{ data.taskNames || '' }}</td>
+            <td>{{ data.startCreated == 1 ? '是' : '否' }}</td>
+            <td>{{ data.autoCreate == 1 ? '是' : '否' }}</td>
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
@@ -51,17 +53,17 @@
     <overlay-scrollbars #osComponentRef1 class="content">
       <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
         <nz-form-item>
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">自动建单名称</nz-form-label>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="title">自动建单名称</nz-form-label>
           <nz-form-control nzErrorTip="请填写自动建单名称!">
             <nz-input-group>
-              <input type="text" nz-input formControlName="name" placeholder="请填写自动建单名称" />
+              <input type="text" nz-input formControlName="title" placeholder="请填写自动建单名称" />
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="deptId">班次</nz-form-label>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="classesId">班次</nz-form-label>
           <nz-form-control nzErrorTip="请选择班次!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="deptId" nzShowSearch nzAllowClear nzPlaceHolder="请选择班次" nzServerSearch (nzOnSearch)="changeSchedule($event)" (nzOpenChange)="openSchedule($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="classesId" nzShowSearch nzAllowClear nzPlaceHolder="请选择班次" nzServerSearch (nzOnSearch)="changeSchedule($event)" (nzOpenChange)="openSchedule($event)">
               <ng-container *ngFor="let data of scheduleList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id">
                 </nz-option>
@@ -73,9 +75,9 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="taskTypes">任务类型</nz-form-label>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="taskTypeIds">任务类型</nz-form-label>
           <nz-form-control nzErrorTip="请选择任务类型!">
-            <nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" formControlName="taskTypes" nzShowSearch nzAllowClear nzPlaceHolder="请选择任务类型" nzServerSearch (nzOnSearch)="changeInp($event)" (nzOpenChange)="openOtherTasktype($event)">
+            <nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" formControlName="taskTypeIds" nzShowSearch nzAllowClear nzPlaceHolder="请选择任务类型" nzServerSearch (nzOnSearch)="changeInp($event)" (nzOpenChange)="openOtherTasktype($event)">
               <ng-container *ngFor="let data of taskTypeList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id">
                 </nz-option>
@@ -87,9 +89,18 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label style="line-height:40px;" [nzSm]="6" [nzXs]="24" nzRequired nzFor="gender">是否起始建单</nz-form-label>
+          <nz-form-label style="line-height:40px;" [nzSm]="6" [nzXs]="24" nzRequired nzFor="startCreated">是否起始建单</nz-form-label>
           <nz-form-control nzErrorTip="请选择是否起始建单!">
-            <nz-radio-group type="gender" formControlName="gender">
+            <nz-radio-group formControlName="startCreated">
+              <label nz-radio [nzValue]="1">是</label>
+              <label nz-radio [nzValue]="0">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label style="line-height:40px;" [nzSm]="6" [nzXs]="24" nzRequired nzFor="autoCreate">是否自动建单</nz-form-label>
+          <nz-form-control nzErrorTip="请选择是否自动建单!">
+            <nz-radio-group formControlName="autoCreate">
               <label nz-radio [nzValue]="1">是</label>
               <label nz-radio [nzValue]="0">否</label>
             </nz-radio-group>

src/app/views/other-auto/other-auto.component.ts

@@ -86,6 +86,9 @@ export class OtherAutoComponent implements OnInit {
       .subscribe((result) => {
         this.loading1 = false;
         result.list = result.list || [];
+        result.list.forEach(v => {
+          v.taskNames = v.taskTypeList.map(v => v.taskName).toString();
+        })
         this.listOfData = result.list;
         this.listLength = result.totalNum;
       });
@@ -122,7 +125,8 @@ export class OtherAutoComponent implements OnInit {
     this.add = true;
     this.modal = true;
     this.initForm();
-    this.validateForm.controls.gender.setValue(0);
+    this.validateForm.controls.startCreated.setValue(0);
+    this.validateForm.controls.autoCreate.setValue(0);
   }
   hideModal() {
     this.modal = false;
@@ -136,10 +140,11 @@ export class OtherAutoComponent implements OnInit {
       this.taskTypeList = [];
     }
     this.validateForm = this.fb.group({
-      name: ['', [Validators.required]],
-      deptId: [null, [Validators.required]],
-      taskTypes: [null, [Validators.required]],
-      gender: [null, [Validators.required]],
+      title: ['', [Validators.required]],
+      classesId: [null, [Validators.required]],
+      taskTypeIds: [null, [Validators.required]],
+      startCreated: [null, [Validators.required]],
+      autoCreate: [null, [Validators.required]],
     });
   }
   // 表单提交
@@ -153,8 +158,11 @@ export class OtherAutoComponent implements OnInit {
     if(this.add){
       this.otherAutoService
       .add({
-        name: this.validateForm.value.name,
-        deptId: this.validateForm.value.deptId,
+        title: this.validateForm.value.title,
+        classesId: this.validateForm.value.classesId,
+        taskTypeIds: this.validateForm.value.taskTypeIds,
+        startCreated: this.validateForm.value.startCreated,
+        autoCreate: this.validateForm.value.autoCreate,
         hosId: this.hosId,
       })
       .subscribe((data) => {
@@ -170,8 +178,11 @@ export class OtherAutoComponent implements OnInit {
     }else{
       this.otherAutoService
       .update({
-        name: this.validateForm.value.name,
-        deptId: this.validateForm.value.deptId,
+        title: this.validateForm.value.title,
+        classesId: this.validateForm.value.classesId,
+        taskTypeIds: this.validateForm.value.taskTypeIds,
+        startCreated: this.validateForm.value.startCreated,
+        autoCreate: this.validateForm.value.autoCreate,
         coopData: this.coopData,
       })
       .subscribe((data) => {
@@ -191,8 +202,11 @@ export class OtherAutoComponent implements OnInit {
   maskFlag: any = false;
   coopData = {};
   edit(data) {
-    this.validateForm.controls.name.setValue(data.name);
-    this.validateForm.controls.deptId.setValue(data.deptId);
+    this.validateForm.controls.title.setValue(data.title);
+    this.validateForm.controls.classesId.setValue(data.classesId);
+    this.validateForm.controls.taskTypeIds.setValue(data.taskTypeList ? data.taskTypeList.map(v => v.id) : null);
+    this.validateForm.controls.startCreated.setValue(data.startCreated);
+    this.validateForm.controls.autoCreate.setValue(data.autoCreate);
     this.modal = true;
     this.add = false;
     this.coopId = data.id;

src/app/views/other-auto/other-auto.service.ts

@@ -15,37 +15,43 @@ export class OtherAutoService {
     let data = {
       idx: pageIndex - 1,
       sum: pageSize,
-      qrCode: {
+      otherCreateOrderRule: {
         hosId,
       },
     };
-    return this.mainService.getFetchDataList("simple/data", "qrCode", data);
+    return this.mainService.getFetchDataList("simple/data", "otherCreateOrderRule", data);
   }
 
   // 列表-删
   delete({id}) {
-    return this.mainService.simplePost("rmvData", "qrCode", [id]);
+    return this.mainService.simplePost("rmvData", "otherCreateOrderRule", [id]);
   }
 
   // 列表-增
-  add({name, deptId, hosId}) {
+  add({title, classesId, taskTypeIds, startCreated, autoCreate, hosId}) {
     let data = {
-      name,
-      deptId,
+      title,
+      classesId,
+      taskTypeIds: taskTypeIds.toString(),
+      startCreated,
+      autoCreate,
       hosId,
     };
 
-    return this.mainService.simplePost("addData", "qrCode", data);
+    return this.mainService.simplePost("addData", "otherCreateOrderRule", data);
   }
 
   // 列表-改
-  update({name, deptId, coopData}) {
+  update({title, classesId, taskTypeIds, startCreated, autoCreate, coopData}) {
     let data = {
-      name,
-      deptId,
+      title,
+      classesId,
+      taskTypeIds: taskTypeIds.toString(),
+      startCreated,
+      autoCreate,
     };
     data = {...coopData, ...data};
-    return this.mainService.simplePost("addData", "qrCode", data);
+    return this.mainService.simplePost("addData", "otherCreateOrderRule", data);
   }
 
   // 查询任务类型-其他临床服务