Merge branch 'fhx-prod-FDD' into master-test

fhx

2024-03-04 142b05a1644aa98df20bbb535db69eb8d00797ea

Merge branch 'fhx-prod-FDD' into master-test

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java

@@ -5,6 +5,7 @@
import com.hz.his.dto.marketing.MarketActivityDto;
import com.hz.his.dto.user.UserTreatRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -29,12 +30,12 @@
    Result templateSignTask(@RequestBody UserTreatRecordDto dto);

    /** 电子病历 - 发起法大大签署任务 */
    @RequestMapping("/fdd/medicalRecords/signTask")
    @RequestMapping(value="/fdd/medicalRecords/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    Result medicalRecordsSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
            , @RequestParam("loginRoleId") String loginRoleId);

    /** 处方单 - 发起法大大签署任务 */
    @RequestMapping("/fdd/prescription/signTask")
    @RequestMapping(value="/fdd/prescription/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
            , @RequestParam("loginRoleId") String loginRoleId);