Merge branch 'dev' of xwm1000.com:topone/qkyxzx-mini-app into dev

src/main/java/com/cirle/scientific/controller/miniapp/LoginController.java

@@ -44,8 +44,8 @@ public class LoginController {
     WeixinService weixinService;
 
     private static final String phones = "13621173040,13390906112,13390906112,15011407616,18515368686,13911906973,18618427271,13501103018,13611127040,13716327458,15901176537,13520544504,13683131351,18600651891,13693161027" +
-            "1346638946,18510351280,18518272962,13581972813,13811592600,13699283983,18801077506,18810482487,18101318590,13718237252,18810766386,15652790935,18911615130,13810921141,13581866981,13381003887,15738268948,18911615067,18518156226," +
-            "18501363756,13006052378,13691241031";
+            "1346638946,18510351280,18518272962,13581972813,13811592600,13699283983,18801077506,18810482487,18101318590,13718237252,18810766386,15652790935,18911615130,13810921141,13581866981,13381003887,18911615067,18518156226," +
+            "18501363756,13006052378,13691241031,13811408269";
 
 
     @RequestMapping(value = "/mobileLogin", method = {RequestMethod.GET})

src/main/java/com/cirle/scientific/controller/miniapp/SuperviseController.java

@@ -8,6 +8,7 @@ import com.cirle.scientific.pojo.BizCodeEnum;
 import com.cirle.scientific.pojo.Result;
 import com.cirle.scientific.service.SuperviseAppService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -29,6 +30,7 @@ public class SuperviseController {
     }
 
     @GetMapping("/findSupervise")
+    @ApiOperation("获取督导结果接口")
     @ResponseBody
     public Result findSupervise(@ApiParam(name = "memCard", value = "用户唯一标识")  @RequestAttribute(name = "memCard", required = false)  String memCard
             , @RequestParam(name = "type") Integer type){

src/main/java/com/cirle/scientific/dao/QkjPatientAppDao.java

@@ -17,7 +17,7 @@ public interface QkjPatientAppDao extends PagingAndSortingRepository<QkjPatientA
     @Query(value = "select * from qkj_patient_app where mem_card = ?1 and id = ?2 and obj_type = ?3 and obj_id = ?4 and status = 0",nativeQuery = true)
     QkjPatientApp findAllByMemCard(String memCard, Integer patientId,  Integer objType, Integer objId);
 
-    @Query(value = "select * from qkj_patient_app where mem_card = ?1 and patient_name = ?2 and status = 0 order by id desc limit 1 ",nativeQuery = true)
+    @Query(value = "select * from qkj_patient_app where mem_card = ?1 and patient_name = ?2 and status = 0 and is_accomplish_question = 1 order by id desc limit 1 ",nativeQuery = true)
     QkjPatientApp findAllByMemCardAndName(String memCard, String patientName);
 
     @Query(value = "select * from qkj_patient_app where mem_card = ?1 and obj_type = ?2 and obj_id = ?3 and phone = ?4 and status = 0 order by id desc limit 1 ",nativeQuery = true)

src/main/java/com/cirle/scientific/dao/QkjSuperviseResultDao.java

@@ -0,0 +1,23 @@
+package com.cirle.scientific.dao;/*
+ *24901
+ *2023/1/11
+ *14:33
+ */
+
+import com.cirle.scientific.po.QkjSuperviseResultApp;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+/**
+ * @author 24901
+ */
+public interface QkjSuperviseResultDao extends JpaRepository<QkjSuperviseResultApp, Long>, JpaSpecificationExecutor<QkjSuperviseResultApp> {
+
+
+    @Query(value = "select * from qkj_supervise_result_app where mem_card= ?1 and type = ?2 and year = ?3 and month = ?4 and status = 0",nativeQuery = true)
+    List<QkjSuperviseResultApp> selectAllByMemCardAndTypeAndYearAndMonth(String memCard, Integer type, Integer year, Integer month);
+
+}

src/main/java/com/cirle/scientific/po/QkjSuperviseResultApp.java

@@ -0,0 +1,60 @@
+package com.cirle.scientific.po;/*
+ *24901
+ *2023/1/11
+ *14:28
+ */
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+/**
+ * @author 24901
+ */
+@Entity
+@Table(name = "qkj_supervise_result_app")
+@Data
+@ApiModel
+@EntityListeners(AuditingEntityListener.class)
+public class QkjSuperviseResultApp {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value = "督导标准内容id")
+    private Long id;
+
+    @ApiModelProperty(value = "用户唯一表示")
+    private String memCard;
+
+    @ApiModelProperty(value = "0: 线上督导结果, 1:线下督导结果, 2:质控结果")
+    private Integer type;
+
+    @ApiModelProperty(value = "标准判断内容")
+    private String criteria;
+
+    @ApiModelProperty(value = "0:未通过 1:通过")
+    private Integer isPass;
+
+    @ApiModelProperty(value = "上传当前的年")
+    private Integer year;
+
+    @ApiModelProperty(value = "上传的月份")
+    private Integer month;
+
+    @ApiModelProperty(value = "状态 0:未删除 1删除")
+    private Integer status;
+
+    @CreatedDate
+    @Column(nullable = false, updatable = false)
+    private LocalDateTime createTime;
+
+    @LastModifiedDate
+    @Column()
+    private LocalDateTime updateTime;
+}

src/main/java/com/cirle/scientific/service/impl/PatientAppServiceImpl.java

@@ -52,6 +52,8 @@ public class PatientAppServiceImpl implements PatientAppService {
             }
             qkjPatientApp.setStatus(0);
             qkjPatientApp.setIsAccomplishQuestion(0);
+            qkjPatientApp.setOneQuestionnaireScore(0);
+            qkjPatientApp.setTowQuestionnaireScore(0);
             qkjPatientApp.setCreateTime(new Date());
             QkjPatientApp qkjPatientApp1 = qkjPatientAppDao.save(qkjPatientApp);
             return qkjPatientApp1.getId();

src/main/java/com/cirle/scientific/service/impl/SuperviseAppServiceImpl.java

@@ -5,15 +5,14 @@ package com.cirle.scientific.service.impl;/*
  */
 
 import com.cirle.scientific.dao.QkjSuperviseAppDao;
+import com.cirle.scientific.dao.QkjSuperviseResultDao;
 import com.cirle.scientific.po.QkjSuperviseApp;
+import com.cirle.scientific.po.QkjSuperviseResultApp;
 import com.cirle.scientific.service.SuperviseAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author 24901
@@ -24,6 +23,13 @@ public class SuperviseAppServiceImpl implements SuperviseAppService {
 
     private QkjSuperviseAppDao qkjSuperviseAppDao;
 
+    private QkjSuperviseResultDao qkjSuperviseResultDao;
+
+    @Autowired
+    public void setQkjSuperviseResultDao(QkjSuperviseResultDao qkjSuperviseResultDao) {
+        this.qkjSuperviseResultDao = qkjSuperviseResultDao;
+    }
+
     @Autowired
     public void setQkjSuperviseAppDao(QkjSuperviseAppDao qkjSuperviseAppDao) {
         this.qkjSuperviseAppDao = qkjSuperviseAppDao;
@@ -39,15 +45,32 @@ public class SuperviseAppServiceImpl implements SuperviseAppService {
             LinkedList<QkjSuperviseApp> resultFile = qkjSuperviseAppDao.findResultFileByYearAndTypeAndMemCard(memCard, year, type);
             for (QkjSuperviseApp qkjSuperviseApp : resultFile) {
                 Map<String,Object> map = new HashMap<>();
-                map.put("month", qkjSuperviseApp.getMonth());
-                if(null != qkjSuperviseApp.getResultFile()){
-                    if(qkjSuperviseApp.getResultFile().endsWith(".xlsx") || qkjSuperviseApp.getResultFile().endsWith(".xls")){
-                        map.put("result", qkjSuperviseApp.getWordFileResult());
+                //如果是线下督导
+                if(type == 1){
+                    if(qkjSuperviseApp.getMonth() <= 3){
+                        map.put("month", 1);
+                    }else if(qkjSuperviseApp.getMonth() >= 3 && qkjSuperviseApp.getMonth() <= 6){
+                        map.put("month", 2);
+                    }else if(qkjSuperviseApp.getMonth() >= 6 && qkjSuperviseApp.getMonth() <= 9){
+                        map.put("month", 3);
+                    }else if(qkjSuperviseApp.getMonth() >= 9 && qkjSuperviseApp.getMonth() <= 12){
+                        map.put("month", 4);
                     }
-                    if(qkjSuperviseApp.getResultFile().endsWith(".jpg") || qkjSuperviseApp.getResultFile().endsWith(".png")){
-                        map.put("result", qkjSuperviseApp.getResultFile());
+                }else{
+                    map.put("month", qkjSuperviseApp.getMonth());
+                }
+                List<QkjSuperviseResultApp> qkjSuperviseResultApps = qkjSuperviseResultDao.selectAllByMemCardAndTypeAndYearAndMonth(memCard, type, year, qkjSuperviseApp.getMonth());
+                List<String> list = new ArrayList<>();
+                for (QkjSuperviseResultApp qkjSuperviseResultApp : qkjSuperviseResultApps) {
+                    String criteria = null;
+                    if(null != qkjSuperviseResultApp.getIsPass() && qkjSuperviseResultApp.getIsPass() == 1){
+                        criteria = qkjSuperviseResultApp.getCriteria()+": "+"是";
+                    }else if(null == qkjSuperviseResultApp.getIsPass() || qkjSuperviseResultApp.getIsPass() == 0){
+                        criteria = qkjSuperviseResultApp.getCriteria()+": "+"否";
                     }
+                    list.add(criteria);
                 }
+                map.put("result", list);
                 data.add(map);
             }
         }catch (Exception e){