完善医生端开方时信息采集校验逻辑

fs-service/src/main/java/com/fs/hisStore/vo/FsUserInformationCollectionVO.java

@@ -53,4 +53,14 @@ public class FsUserInformationCollectionVO {
     //是否销售代填写 0-否 1-是
     private Boolean isSalesProxyFill;
 
+    /**
+     * 填表标识 0-未填写 1-已填写
+     * */
+    private Integer fillFlag;
+
+    /*
+     *完善状态 0-未完善 1-完善
+     * */
+    private Integer completeStatus;
+
 }

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

@@ -311,6 +311,8 @@
         dp.doctor_name doctor_drug_name,
         fso.order_code,fso.`status` order_status,
         fse.store_name,
+        main_infoc.id as collectionId,
+        main_infoc.complete_status as completeStatus,
         CASE
         WHEN uics.order_code IS NOT NULL THEN 1         <!--  处方来源"信息采集进度表"-->
         WHEN so.third_party_user_id IS NOT NULL AND infoc.info_source = 2 THEN 2        <!--  处方来源"超拼网"-->
@@ -324,6 +326,7 @@
         LEFT JOIN fs_store fse ON fse.store_id = so.store_id
         LEFT JOIN fs_user_information_collection_schedule uics ON uics.order_code = fso.order_code
         LEFT JOIN fs_user_information_collection infoc ON infoc.third_party_user_id = so.third_party_user_id
+        LEFT JOIN fs_user_information_collection main_infoc ON main_infoc.user_id = so.user_id
         <where>
             so.doctor_confirm != -1                <!--  被医生拒访的处方不展示-->
             AND (fso.order_id IS NULL OR (fso.status != -3 AND fso.status != -2))   <!--  已取消与已退款的订单处方不展示-->