v 1.2.0

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -187,6 +187,12 @@ public class WorkOrderBaseController extends BaseController {
                 break;
             case 4:
                 qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dhf.getValue());
+               // qw.eq(WorkOrderBase::getIsYj,null).or().isNull(WorkOrderBase::getIsYj);
+                qw.and(wrapper -> wrapper
+                        .ne(WorkOrderBase::getIsYj, 1) // is_yj != 1
+                        .or()
+                        .isNull(WorkOrderBase::getIsYj) // OR is_yj IS NULL
+                );
                 break;
             //我的回复列表
             case 5:
@@ -367,16 +373,23 @@ public class WorkOrderBaseController extends BaseController {
             }
 
             //添加操作日志
+            String addcon="";
+            if(input.getIsYj()!=null &&input.getIsYj()==1){
+
+                addcon="高危";
+            }
             if (input.getIsend() == 0) {
-                boolean logresult = addlog("创建了工单", "创建", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
+
+
+                boolean logresult = addlog("创建了"+addcon+"工单", "创建", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
             } else {
                 //结束了 已完成
 if(input.getIsNeedVisit()==1){
-    boolean logresult = addlog("创建了工单,工单待回访", "创建", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
+    boolean logresult = addlog("创建了"+addcon+"工单,工单待回访", "创建", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
 
 }
 else {
-    boolean logresult = addlog("创建并完成了工单" + dealContent, "创建并完成", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
+    boolean logresult = addlog("创建并完成了"+addcon+"工单" + dealContent, "创建并完成", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
 
 }
             }
@@ -1141,7 +1154,7 @@ else {
     @ApiOperation("导出Excel")
     @Log(title = "导出Excel", businessType = BusinessType.EXPORT)
     @PostMapping("/exportExcel")
-    @Anonymous
+
     public void exportExcel( WorkOrderBase input,Integer  listType) {
         LambdaQueryWrapper<WorkOrderBase> qw = new LambdaQueryWrapper<>();
 
@@ -1436,7 +1449,10 @@ else {
     @ApiOperation("移除高危工单")
     @Log(title = "移除高危工单", businessType = BusinessType.UPDATE)
     @PutMapping("/remove")
-    public AjaxResult remove(@RequestParam String code){
+
+    public AjaxResult remove(@RequestBody  HashMap<String,Object> map){
+
+        String code=map.get("code").toString();
         if(StringHelper.isEmpty(code)){
             return  Error("工单编号不能为空");
         }
@@ -1446,15 +1462,18 @@ else {
         //工单状态改
         qw.set(WorkOrderBase::getIsYj,  2L);
         boolean update = workorderbaseService.updateBatch(qw);
-        if(update)
-        return  Success("移除成功");
+        if(update){
+            addlog("移除了高危工单", "移除", CurrentUser().getUserName(), code, CurrentUser().getNickName(), "");
+            return  Success("移除成功");
+
+        }
         else return  Error("移除失败");
     }
 
 
     @ApiOperation("根据工单编号获取填写的问卷")
     @Log(title = "根据工单编号获取填写的问卷", businessType = BusinessType.UPDATE)
-    @PutMapping("/getsurveyinfo")
+    @GetMapping("/getsurveyinfo")
     public AjaxResult getSurveyInfo(@RequestParam String code) {
         if (StringHelper.isEmpty(code)) {
             return Error("code不能为空");

hjzx-api/src/main/java/api/controller/patient/BlackListController.java

@@ -1,11 +1,14 @@
 package api.controller.patient;
 
+import api.entity.database.call.Blacklist;
 import api.entity.database.patient.Patient;
 import api.entity.database.patient.PatientLog;
 import api.entity.input.patient.AddBlackListInput;
+import api.service.call.IBlacklistService;
 import api.service.patient.IPatientLogService;
 import api.service.patient.IPatientService;
 import api.util.enums.PhoneStatus;
+import api.util.helper.DateHelper;
 import api.util.helper.SecretHelper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -27,7 +30,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-
+import api.service.call.IBlacklistService;
 @Api(value = "黑名单",tags = "黑名单")
 @RestController
 @RequestMapping("/patient/black")
@@ -38,6 +41,9 @@ public class BlackListController extends BaseController {
     private IPatientLogService patientlogService;
 
     @Autowired
+    private IBlacklistService callblacklistService;
+
+    @Autowired
     private IPatientService patientService;
 
     @ApiOperation("列表")
@@ -117,6 +123,26 @@ public class BlackListController extends BaseController {
             wrapper.set(Patient::getPhoneStatus, PhoneStatus.BLACK.getValue());
           boolean paresult=  patientService.updateBatch(wrapper);
 
+          //同步到通话记录的黑名单表
+            Blacklist blacklist=new Blacklist();
+            blacklist.setCreateBy(CurrentUser().getUserName());
+            blacklist.setCreateTime(new Date());
+            blacklist.setDelFlag("0");
+            if(input.getStarttime()==null && input.getEndtime()==null){
+                blacklist.setBlackType(2L);
+            }
+             else {
+                blacklist.setBlackType(1L);
+                blacklist.setStartTime(input.getStarttime());
+                blacklist.setEndTime(input.getEndtime());
+            }
+
+            blacklist.setCallNumber(SecretHelper.AesDecrypt(patient.getPhoneNumber()));
+
+            blacklist.setRemark(input.getReason());
+            callblacklistService.insert(blacklist);
+
+
             return Success("成功");
         } else {
             return Error("新增失败");
@@ -137,15 +163,34 @@ public class BlackListController extends BaseController {
         qw.set(BlackList::getStarttime, input.getStarttime());
      //   qw.set(BlackList::getPhoneNumber, input.getPhoneNumber());
 
+
         boolean result = blacklistService.updateBatch(qw);
         if (result) {
+            BlackList bl=blacklistService.getEntity(input.getBlackId());
+            String callnum= SecretHelper.AesDecrypt(  bl.getPhoneNumber());
+            LambdaUpdateWrapper<Blacklist> updateWrapper=new LambdaUpdateWrapper<>();
+            updateWrapper.eq(Blacklist::getCallNumber,callnum);
+            updateWrapper.set(Blacklist::getStartTime,input.getStarttime());
+            updateWrapper.set(Blacklist::getEndTime,input.getEndtime());
+            updateWrapper.set(Blacklist::getRemark,input.getReason());
+            updateWrapper.set(Blacklist::getUpdateBy,CurrentUser().getUserName());
+            updateWrapper.set(Blacklist::getUpdateTime,new Date());
+
+            if(input.getStarttime()==null && input.getEndtime()==null){
+                updateWrapper.set(Blacklist::getBlackType,2L);
+            }
+            else {
+                updateWrapper.set(Blacklist::getBlackType,1L);
+            }
+            callblacklistService.updateBatch(updateWrapper);
+
             return Success("成功");
         } else {
             return Error("修改失败");
         }
     }
 
-    @ApiOperation("批量解除黑名单,参数是blackid")
+    @ApiOperation("批量解除黑名单,参数是blackid,其实只能传1个")
     @Log(title = "批量解除黑名单p_blacklist",businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult delete(@PathVariable Long[] ids)  {
@@ -155,6 +200,22 @@ public class BlackListController extends BaseController {
         lp.set(BlackList::getIsDelete, 1);
         boolean result = blacklistService.updateBatch(lp);
         if (result) {
+
+            for (Long id :ids){
+                BlackList bl=blacklistService.getEntity(id);
+               String callnum= SecretHelper.AesDecrypt(  bl.getPhoneNumber());
+
+                LambdaUpdateWrapper<Blacklist> lplp = new LambdaUpdateWrapper<>();
+                lplp.eq(Blacklist::getCallNumber,callnum);
+                lplp.set(Blacklist::getDelFlag,2L);
+                lplp.set(Blacklist::getDelTime,new Date());
+                lplp.set(Blacklist::getDelBy,CurrentUser().getUserName());
+                callblacklistService.updateBatch(lplp);
+            }
+
+
+
+
             //删除标签 存log记录
             LambdaQueryWrapper<BlackList> qw1 = new LambdaQueryWrapper<>();
             qw1.in(BlackList::getBlackId, ids).select(BlackList::getPatientId, BlackList::getPatientName);

hjzx-api/src/main/java/api/controller/survey/AnswerSheetController.java

@@ -1,16 +1,12 @@
 package api.controller.survey;
 
 import api.entity.database.patient.Patient;
-import api.entity.database.survey.Answer;
-import api.entity.database.survey.ScoreRange;
-import api.entity.database.survey.Survey;
+import api.entity.database.survey.*;
 import api.entity.view.survey.AnswerSheetView;
 
 import api.service.patient.IPatientLogService;
 import api.service.patient.IPatientService;
-import api.service.survey.IAnswerService;
-import api.service.survey.IScoreRangeService;
-import api.service.survey.ISurveyService;
+import api.service.survey.*;
 import api.util.annotation.Anonymous;
 import api.util.helper.DateHelper;
 import api.util.helper.SecretHelper;
@@ -20,10 +16,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import api.controller.BaseController;
-import api.entity.database.survey.AnswerSheet;
 import api.entity.input.PageInput;
 import api.model.AjaxResult;
-import api.service.survey.IAnswerSheetService;
 import api.util.annotation.Log;
 import api.util.enums.BusinessType;
 import api.util.helper.StringHelper;
@@ -32,6 +26,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.map.LinkedMap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
@@ -53,11 +48,14 @@ public class AnswerSheetController extends BaseController {
     private IScoreRangeService scorerangeService;
     @Autowired
     private IPatientService patientService;
-
+    @Autowired
+    private IOptionService optionService;
+    @Autowired
+    private IQuestionService questionService;
     @ApiOperation("根据surveyid查询用户列表")
     @Log(title = "查询q_answersheet列表",businessType = BusinessType.QUERY)
     @GetMapping
-    @Anonymous
+
     public AjaxResult getList(AnswerSheet input, PageInput pageInput) {
 
        if  (input.getSurveyid() == null || input.getSurveyid() == 0){
@@ -126,13 +124,14 @@ public class AnswerSheetController extends BaseController {
     @ApiOperation("问卷填写答案")
     @Log(title = "新增q_answersheet",businessType = BusinessType.INSERT)
     @PostMapping
-    @Anonymous
+
+    @Transactional
     public AjaxResult add(@RequestBody AnswerSheetView input) {
+
         Survey s= surveyService.getEntity(input.getSurveyid());
 
         if(Objects.equals(s.getStatus(), "1")){
             return  Error("该问卷未发布");
-
         }
         else if (Objects.equals(s.getStatus(), "3")){
         }
@@ -178,6 +177,12 @@ public class AnswerSheetController extends BaseController {
         answerSheet.setTaskId(input.getTaskId());
         answerSheet.setCallId(input.getCallId());
         boolean result = answersheetService.insert(answerSheet);
+      LambdaQueryWrapper<Option> asq=new LambdaQueryWrapper<>();
+      asq.eq(Option::getSurveyid,input.getSurveyid());
+     List<Option> options=   optionService.getList(asq);
+
+
+
         if (result) {
             //给suvery更新一下答题的人数
             LambdaUpdateWrapper<Survey> sqw=new LambdaUpdateWrapper<>();
@@ -193,8 +198,18 @@ public class AnswerSheetController extends BaseController {
                     as.setCreatetime(currentDate);
                     as.setDeleteflag(0L);
                     as.setSheetId(answerSheet.getAnswersheetId());
-                    if(as.getScore()!=null  && as.getScore()>0) {
-                        totalscore=totalscore+as.getScore();
+                    if(as.getOptionid()!=null && as.getOptionid()>0){
+                        //这是单选
+                        Optional<Long> scoreOptional = options.stream()
+                                .filter(x -> Objects.equals(x.getOptionId(), as.getOptionid()))
+                                .map(Option::getScore)
+                                .filter(Objects::nonNull)  // 过滤掉 null 值
+                                .findFirst();
+                        Long score = scoreOptional.orElse(0L);  // 如果没有找到 score，返回默认值 0
+
+                            totalscore=totalscore+score;
+
+                            as.setScore(score);
                     }
                     answerService.insert(as);
                 }
@@ -204,11 +219,11 @@ public class AnswerSheetController extends BaseController {
             if ( totalscore >=0) {
                 //根据总分和surveyid 判断是哪个标签名，存一下
             Map<String,Object> resmap= scorerangeService.selectLabelColorBySurveyIdTotalScore(input.getSurveyid(),totalscore);
-              if( resmap.containsKey("labelName")){
+              if( resmap!=null &&  resmap.containsKey("labelName")){
                   labelname=  resmap.get("labelName").toString();
 
               }
-                if( resmap.containsKey("color")){
+                if(resmap!=null &&  resmap.containsKey("color")){
                     color=  resmap.get("color").toString();
 
                 }
@@ -218,7 +233,8 @@ public class AnswerSheetController extends BaseController {
                 las.set(AnswerSheet::getLabelName,labelname);
                 answersheetService.updateBatch(las);
             }
-            if(Objects.equals(s.getSurveyType(), "ldtp") && totalscore>=s.getYjMinScore()){
+            //s.getYjMinScore()!=null &&
+            if(s.getYjMinScore()!=null && Objects.equals(s.getSurveyType(), "ldtp") && totalscore>=s.getYjMinScore()){
 
                 Map<String,Object> map=new LinkedHashMap<>();
                 map.put("surveyId",input.getSurveyid() );
@@ -290,7 +306,7 @@ public class AnswerSheetController extends BaseController {
     @ApiOperation("根据问卷id获取问卷填写的有效数量和总数")
     @Log(title = "根据问卷id获取问卷填写的有效数量和总数",businessType = BusinessType.INSERT)
     @GetMapping("/getcount")
-    @Anonymous
+
     public AjaxResult getcount(@RequestParam long surveyId) {
 
         LambdaQueryWrapper<AnswerSheet> lqw=new LambdaQueryWrapper<>();

hjzx-api/src/main/java/api/controller/survey/SurveyController.java

@@ -30,6 +30,7 @@ import lombok.var;
 import org.checkerframework.checker.nullness.Opt;
 import org.elasticsearch.cluster.metadata.AliasAction;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.DecimalFormat;
@@ -139,7 +140,7 @@ public class SurveyController extends BaseController {
     @ApiOperation("详情 参数是id和分类名")
     @Log(title = "查询q_survey详情",businessType = BusinessType.QUERY)
     @GetMapping("/getinfo")
-    @Anonymous
+
     public AjaxResult getInfo(   long id,   String classname) {
         //根据问卷id 获取问题及选项
         Survey survey=  surveyService.getEntity(id) ;
@@ -181,7 +182,7 @@ public class SurveyController extends BaseController {
     @ApiOperation("详情")
     @Log(title = "查询q_survey详情",businessType = BusinessType.QUERY)
     @GetMapping("/getdetail")
-    @Anonymous
+
     public AjaxResult getdetail( @RequestParam long id,
                                  @RequestParam(required = false) String user,
                                  @RequestParam(required = false) String patientid,
@@ -254,9 +255,9 @@ public class SurveyController extends BaseController {
 
          List<Answer> det=   answerList.stream().filter(x->x.getQuestionid().equals(qs.getQuestionId())  ).collect(Collectors.toList());
 
-         if(sheetid!=null && sheetid>0){
-             det=det.stream().filter(x->x.getSheetId()==sheetid).collect(Collectors.toList());
-         }
+//         if(sheetid!=null && sheetid>0){
+//             det=det.stream().filter(x->x.getSheetId()==sheetid).collect(Collectors.toList());
+//         }
          if(det==null || det.stream().count()==0){
                 qsv.setAnswerdetail("");
             }
@@ -274,7 +275,10 @@ public class SurveyController extends BaseController {
             {
 //              var vv=  answerList.stream().filter(x->x.getQuestionid().equals(qs.getQuestionId())).findAny();
 //                vv.ifPresent(answer -> qsv.setScore(answer.getScore()));
-                qsv.setScore(answerList.stream().filter(x->x.getQuestionid().equals(qs.getQuestionId())).findAny().get().getScore());
+
+//              try{
+//                  qsv.setScore(answerList.stream().filter(x->x.getQuestionid().equals(qs.getQuestionId())).findAny().get().getScore());
+//              }catch (){}
                 qsv.setAnswerdetail(answerList.stream().filter(x->x.getQuestionid().equals(qs.getQuestionId())).findAny().get().getAnswer());
             }
             System.out.println(qsv);
@@ -303,7 +307,7 @@ public class SurveyController extends BaseController {
     @ApiOperation("新增")
     @Log(title = "新增q_survey",businessType = BusinessType.INSERT)
     @PostMapping
-
+    @Transactional
     public AjaxResult add(@RequestBody SurveyView input) {
         if (input.getQuestionlist() == null || input.getQuestionlist().stream().count() == 0) {
             return Error("问题不能为空");
@@ -402,8 +406,9 @@ public class SurveyController extends BaseController {
                 if(input.getScoreRanges()!=null && !input.getScoreRanges().isEmpty())
                 {
                       for (ScoreRange sr : input.getScoreRanges()){
-                          if(sr.isCheckin()){
-                              LambdaUpdateWrapper<Survey> luw=new LambdaUpdateWrapper<>();
+                         // if(sr.isCheckin()){
+                          if(StringHelper.isNotEmpty(input.getSurveyScoreLabel()) &&  Objects.equals(sr.getLabelName(), input.getSurveyScoreLabel()))
+                          {  LambdaUpdateWrapper<Survey> luw=new LambdaUpdateWrapper<>();
                               luw.set(Survey::getYjMinScore,sr.getMin());
                               luw.set(Survey::getSurveyScoreLabel,sr.getLabelName());
                               luw.eq(Survey::getSurveyId,surveyid);
@@ -411,6 +416,7 @@ public class SurveyController extends BaseController {
                           }
                           sr.setSurveyId(surveyid);
                            sr.setCreateBy(CurrentUser().getUserName());
+                          sr.setCreateTime(new Date());
                           scoreRangeService.insert(sr);
                       }
 
@@ -481,7 +487,7 @@ public class SurveyController extends BaseController {
     @ApiOperation("统计详情")
     @Log(title = "查询q_survey详情",businessType = BusinessType.QUERY)
     @GetMapping("/answerstatis/{id}")
-    @Anonymous
+
     public AjaxResult getAnswerStatis(@PathVariable long id) {
         List<AnswerStatisView> statisViewList = answerService.selectAnswerStatis(id);
         //根据问卷id 获取问题及选项
@@ -534,7 +540,7 @@ public class SurveyController extends BaseController {
     @ApiOperation("数据导出Excel")
     @Log(title = "回答数据导出Excel", businessType = BusinessType.EXPORT)
     @PostMapping("/answerlist/exportExcel")
-    @Anonymous
+
     public void answerListExportExcel(Long surveyid) {
         LambdaQueryWrapper<Question> qw=new LambdaQueryWrapper<>();
         qw.eq(Question::getSurveyid,surveyid);
@@ -597,7 +603,7 @@ public class SurveyController extends BaseController {
     @ApiOperation("查询q_survey问题的分类")
     @Log(title = "查询q_survey问题的分类",businessType = BusinessType.QUERY)
     @GetMapping("getclassification")
-    @Anonymous
+
     public AjaxResult getInfoByType( long id) {
         LambdaQueryWrapper<Question> qw = new LambdaQueryWrapper();
         if(id>0){
@@ -661,6 +667,7 @@ public AjaxResult getStatisScoreRange(@PathVariable long id) {
     @ApiOperation("根据手机号,问卷id 获取填写的sheet数据")
     @Log(title = "根据工单编号获取填写的问卷", businessType = BusinessType.UPDATE)
     @GetMapping("/getsurveyinfo")
+
     public AjaxResult getSurveyInfo(@RequestParam String phone,@RequestParam long surveyid){
         if ( StringHelper.isEmpty( phone)){
             return  Error("phone不能为空");
@@ -674,19 +681,27 @@ public AjaxResult getStatisScoreRange(@PathVariable long id) {
         LambdaQueryWrapper<AnswerSheet> lqw=new LambdaQueryWrapper<>();
         lqw.eq(AnswerSheet::getSurveyid,surveyid);
         lqw.eq(AnswerSheet::getEnterphone, SecretHelper.AesEncrypt( phone));
+        lqw.orderByDesc(AnswerSheet::getCreatetime);
         List<AnswerSheet> lists=  answerSheetService.getList(lqw);
          for (AnswerSheet as :lists){
 
-             Optional<String> color = sclist.stream()
-                     .filter(scoreRange -> as.getLabelName().equals(scoreRange.getLabelName())) // 过滤 label 为 "张三" 的对象
-                     .map(ScoreRange::getColor) // 映射到 color 字段
-                     .findFirst(); // 获取第一个匹配的 color
+             if(StringHelper.isNotEmpty(as.getLabelName())){
+                 Optional<String> color = sclist.stream()
+                         .filter(scoreRange -> as.getLabelName().equals(scoreRange.getLabelName())) // 过滤 label 为 "张三" 的对象
+                         .map(ScoreRange::getColor)  // 映射到 color 字段
+                         .filter(Objects::nonNull)  // 过滤掉 null 值
+                         .findFirst();
+
+
+                 if (color.isPresent()) {
+                     as.setYjColor(color.get());
+                 }
 
-             if (color.isPresent()) {
-                 as.setYjColor(color.get());
              }
 
 
+
+
              as.setYjName(as.getLabelName());
 
          }
@@ -854,7 +869,7 @@ public AjaxResult getStatisScoreRange(@PathVariable long id) {
     @ApiOperation("根据callid 获取来电弹屏的问卷列表")
     @Log(title = "根据工单编号获取填写的问卷", businessType = BusinessType.UPDATE)
     @GetMapping("/getcallsurvey")
-    @Anonymous
+
     public AjaxResult getcallsurvey(@RequestParam String callid,@RequestParam(required = false) String phone,@RequestParam (required = false) String part){
         LambdaQueryWrapper<Survey> surveyLambdaQueryWrapper =new LambdaQueryWrapper<>();
         surveyLambdaQueryWrapper.eq(Survey::getSurveyType,"ldtp");