feat: ysy生成处方签名

fs-doctor-app/src/main/java/com/fs/app/controller/FsPrescribeController.java

@@ -153,17 +153,6 @@ public class FsPrescribeController extends BaseController
         return AjaxResult.success(fsPrescribe);
     }
 
-    @GetMapping(value = "/queryIdCard/{orderId}")
-    @Log(title = "查看身份证", businessType = BusinessType.GRANT)
-    @PreAuthorize("@ss.hasPermi('his:prescribe:queryIdCard')")
-    public R getPhone(@PathVariable("orderId") Long orderId)
-    {
-        FsPatient fsPatient = fsPatientMapper.selectFsPatientByPatientId(orderId);
-        String idCard = fsPatient.getIdCard();
-        return R.ok().put("data",idCard);
-    }
-
-
     /**
      * 获取处方详细信息
      */
@@ -177,7 +166,7 @@ public class FsPrescribeController extends BaseController
     /**
      * 新增处方
      */
-    @Log(title = "处方", businessType = BusinessType.INSERT)
+    @Log(title = "新增处方", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FsPrescribe fsPrescribe)
     {
@@ -187,7 +176,7 @@ public class FsPrescribeController extends BaseController
     /**
      * 修改处方
      */
-    @Log(title = "处方", businessType = BusinessType.UPDATE)
+    @Log(title = "修改处方", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FsPrescribe fsPrescribe)
     {
@@ -197,7 +186,7 @@ public class FsPrescribeController extends BaseController
     /**
      * 删除处方
      */
-    @Log(title = "处方", businessType = BusinessType.DELETE)
+    @Log(title = "删除处方", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{prescribeIds}")
     public AjaxResult remove(@PathVariable Long[] prescribeIds)
     {

fs-service/src/main/java/com/fs/his/vo/FsPrescribeListVO.java

@@ -163,4 +163,9 @@ public class FsPrescribeListVO {
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+
+    /**
+     * 医生是否确认 0未确认 1已确认 -1其他系统
+     */
+    private Integer doctorConfirm;
 }

fs-service/src/main/resources/mapper/his/FsPrescribeMapper.xml

@@ -308,6 +308,8 @@
             <if test="orderStatus != null "> and fso.`status` = #{orderStatus}</if>
             <if test="storeId != null "> and so.store_id = #{storeId}</if>
         </where>
-        order by prescribe_id desc
+        order by
+            CASE WHEN doctor_confirm = 0 THEN 0 ELSE 1 END,
+            prescribe_id desc
     </select>
 </mapper>