1.6

hjzx-api/src/main/java/api/controller/common/CommonController.java

@@ -262,12 +262,9 @@ public class CommonController extends BaseController {
             }
         });
         Thread thread2 = new Thread(() -> {
-            LambdaQueryWrapper<BlackList> blackwrapper=new LambdaQueryWrapper<>();
-            blackwrapper.eq(BlackList::getPhoneNumber, SecretHelper.AesEncrypt(phone));
-            blackwrapper.ge(BlackList::getEndtime,DateHelper.getNowDate());
-            blackwrapper.le(BlackList::getStarttime,DateHelper.getNowDate());
-            Boolean isexits=  blacklistService.exists(blackwrapper);
-            if(isexits){
+
+         long res=    blacklistService.existBlackByphone(SecretHelper.AesEncrypt(phone));
+            if(res>0){
                 Map<String,Object> map=new LinkedHashMap<>();
                 map.put("labelName","黑名单");
                 maplist.add(map);

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

@@ -7,8 +7,10 @@ import api.entity.database.patient.Patient;
 import api.entity.database.survey.*;
 import api.entity.database.system.*;
 import api.entity.input.PageInput;
+import api.entity.input.order.OrderSearchInput;
 import api.entity.input.order.TimeOutReportInput;
 import api.entity.input.order.TransOrderInput;
+import api.entity.input.survey.SearchInput;
 import api.entity.view.order.ExportWorkOrderBaseView;
 import api.entity.view.order.TimeOutReportView;
 import api.entity.view.order.WorkOrderBaseView;
@@ -116,9 +118,13 @@ public class WorkOrderBaseController extends BaseController {
     @Log(title = "查询wo_workorderbase列表", businessType = BusinessType.QUERY)
     @GetMapping
 
-    public AjaxResult getList(WorkOrderBase input, PageInput pageInput, int listType) {
+    public AjaxResult getList(WorkOrderBase input, PageInput pageInput, int listType, OrderSearchInput searchInput) {
         LambdaQueryWrapper<WorkOrderBase> qw = new LambdaQueryWrapper<>();
 
+
+
+
+        qw.eq( input.getSex()!=null && input.getSex()>-1, WorkOrderBase::getSex, input.getSex());
         qw.eq(input.getFirsttype() != null && input.getFirsttype() > 0, WorkOrderBase::getFirsttype, input.getFirsttype());
         qw.like(!StringHelper.isEmpty(input.getCallnum()), WorkOrderBase::getCallnum, input.getCallnum());
         qw.like(!StringHelper.isEmpty(input.getCaller()), WorkOrderBase::getCaller, input.getCaller());
@@ -165,7 +171,9 @@ public class WorkOrderBaseController extends BaseController {
         qw.le(input.getEndtime() != null , WorkOrderBase::getCreatetime, input.getEndtime());
 
 
-
+        //ge("age", 18)表示查询年龄大于等于18的记录。
+        qw.ge(searchInput.getSage() != null  && searchInput.getSage()>0 , WorkOrderBase::getAge, searchInput.getSage());
+        qw.le(searchInput.getEage() != null  && searchInput.getEage()>0, WorkOrderBase::getAge, searchInput.getEage());
 
 //        LambdaQueryWrapper<Role> qwrole = new LambdaQueryWrapper<>();
 //        qwrole.in(Role::getRoleId, CurrentUser().getRoleIds());
@@ -356,6 +364,7 @@ public class WorkOrderBaseController extends BaseController {
        WorkOrderType typemodel=   workrodertypeService.getEntity(  input.getWorkordercate());
         input.setAncestor(","+typemodel.getAncestors()+","+input.getWorkordercate()+",");
 
+
         boolean result = workorderbaseService.insert(input);
         if ( input.getCallId() !=null && input.getCallId()>0) {
 
@@ -439,6 +448,8 @@ else {
                 pt.setName(input.getCaller());
 
                 pt.setPatientId(uuid.toString());
+                pt.setSex(input.getSex());
+                pt.setAge(input.getAge());
                 try {
                     if (StringHelper.isNotBlank(input.getCallnum())) {
                         pt.setPhoneNumber(SecretHelper.AesEncrypt(input.getCallnum()));
@@ -451,6 +462,12 @@ else {
 
                 return Success("成功", input.getWorkorderId());
             } else {
+             var pat=    recordList.get(0);
+             pat.setAge(input.getAge());
+             pat.setSex(input.getSex());
+                pat.setUpdateTime(currentDate);
+                boolean customeruptresult = patientService.update(pat);
+
                 return Success("成功", input.getWorkorderId());
             }
         }
@@ -464,7 +481,7 @@ else {
         Date currentDate = new Date(System.currentTimeMillis());
         WorkOrderBase orderBase = workorderbaseService.getEntity(input.getWorkorderId());
 
-        if(!Objects.equals(input.getWorkordercate(), orderBase.getWorkordercate())){
+        if(input.getWorkordercate()!=null && input.getWorkordercate()>0 && !Objects.equals(input.getWorkordercate(), orderBase.getWorkordercate())){
 
             WorkOrderType typemodel=   workrodertypeService.getEntity(  input.getWorkordercate());
             input.setAncestor(","+typemodel.getAncestors()+","+input.getWorkordercate()+",");
@@ -489,6 +506,19 @@ else {
         boolean result = workorderbaseService.update(input);
         if (result) {
 
+            //判断手机号存在不customer，不存在就添加新用户
+            LambdaQueryWrapper<Patient> qw = new LambdaQueryWrapper<>();
+            qw.eq(Patient::getPhoneNumber, SecretHelper.AesEncrypt(input.getCallnum()));
+            qw.eq(Patient::getIsDelete, 0);
+            var  recordList = patientService.getList(qw);
+            if(recordList!=null && recordList.size()>0){
+                var pat=    recordList.get(0);
+                pat.setAge(input.getAge());
+                pat.setSex(input.getSex());
+                pat.setUpdateTime(currentDate);
+                boolean customeruptresult = patientService.update(pat);
+            }
+
             boolean logresult = addlog("编辑了工单", "编辑", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
             return Success("成功");
         } else {
@@ -607,6 +637,14 @@ else {
     public WorkOrderBaseView trans(WorkOrderBase orderBase) {
 
         WorkOrderBaseView ov = JSON.parseObject(JSON.toJSONString(orderBase), WorkOrderBaseView.class);
+        if(!StringHelper.isEmpty(orderBase.getHandlingMeasures())){
+            String[] targetNames = orderBase.getHandlingMeasures().split(",");
+            List<String> targetSet =   Arrays.asList(targetNames);
+            String hmn= dictDataService.selectDictLabels("order_handling_measures",targetSet);
+            ov.setHandlingMeasuresName( hmn);
+        }
+
+
         if(orderBase.getWorkorderstate()>EnumOrderStatus.dhf.getValue()){
             LambdaQueryWrapper<WorkOrderVisitLog> la=new LambdaQueryWrapper<>();
             la.eq(WorkOrderVisitLog::getWorkordercode,orderBase.getWorkordercode());
@@ -1190,6 +1228,8 @@ else {
     public void exportExcel( WorkOrderBase input,Integer  listType) {
         LambdaQueryWrapper<WorkOrderBase> qw = new LambdaQueryWrapper<>();
 
+        qw.eq( input.getSex()!=null && input.getSex()>-1, WorkOrderBase::getSex, input.getSex());
+
         qw.eq(input.getFirsttype()!=null && input.getFirsttype()>0,WorkOrderBase::getFirsttype, input.getFirsttype());
         qw.like(!StringHelper.isEmpty(input.getCallnum()), WorkOrderBase::getCallnum, input.getCallnum());
         qw.like(!StringHelper.isEmpty(input.getCaller()), WorkOrderBase::getCaller, input.getCaller());

hjzx-api/src/main/java/api/controller/report/WorkReportController.java

@@ -110,7 +110,7 @@ public class WorkReportController extends BaseController {
                     report.setAnswerRate(String.format("%.2f", Answer*100)+ "%"); ;
                     if ((report.getSatisfied()+report.getNoSatisfied())>0)
                     {
-                        double  myd = ((double)report.getSatisfied()/(report.getSatisfied()+report.getNoSatisfied()));//结果的百分比
+                        double  myd = ((double)report.getSatisfied()+report.getSatisfactory()/(report.getSatisfied()+report.getNoSatisfied()+report.getSatisfactory()));//结果的百分比
                         report.setMydRate(String.format("%.2f", myd*100)+ "%");
                     }
                 }

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

@@ -651,9 +651,13 @@ public AjaxResult getStatisScoreRange(@PathVariable long id) {
                 sf.setPer("0");
             } else {
 
-                double percentage = ((double) sf.getTotal() / totalnum) * 100;
+              //  double percentage = ((double) sf.getTotal() / totalnum) * 100;
 
-                sf.setPer(percentage + "%");
+                double ratio = (double) sf.getTotal() / totalnum;
+                DecimalFormat df = new DecimalFormat("0.00%");
+                String result = df.format(ratio); // 自动转为30.67%
+
+                sf.setPer(df.format(ratio));
             }
         }
     }

hjzx-entity/src/main/java/api/entity/database/order/WorkOrderBase.java

@@ -217,5 +217,9 @@ public class WorkOrderBase {
     @TableField(exist = false)
     @ApiModelProperty("问卷id")
     private Long surveyId;
-
+    @ApiModelProperty("性别，存男、女")
+    private Long sex;
+    /** 处理措施 */
+    @ApiModelProperty("处理措施")
+    private String handlingMeasures;
 }

hjzx-entity/src/main/java/api/entity/input/order/OrderSearchInput.java

@@ -0,0 +1,19 @@
+package api.entity.input.order;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class OrderSearchInput {
+
+
+    @ApiModelProperty("年龄搜索小值")
+    private  Long  sage;
+    @ApiModelProperty("年龄搜索大值")
+    private  Long  eage;
+
+}

hjzx-entity/src/main/java/api/entity/view/order/WorkOrderBaseView.java

@@ -61,6 +61,8 @@ public class WorkOrderBaseView extends WorkOrderBase {
     private Date visitTime;
     private  String dealmethod;
 
+    @ApiModelProperty("处理措施显示")
+    private  String handlingMeasuresName;
 
 
 }

hjzx-entity/src/main/java/api/entity/view/report/RecordReport.java

@@ -29,6 +29,10 @@ public class RecordReport {
     @ApiModelProperty("满意量")
     private long satisfied;
 
+    @ApiModelProperty("基本满意量")
+    private long satisfactory;
+
+
     @ApiModelProperty("不满意量")
     private long noSatisfied;
 

hjzx-mapper/src/main/java/api/mapper/patient/BlackListMapper.java

@@ -6,4 +6,6 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface BlackListMapper extends BaseMapper<BlackList> {
+
+    Long  existBlackByphone(String phone) ;
 }

hjzx-mapper/src/main/java/api/mapper/system/DictDataMapper.java

@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import api.entity.database.system.DictData;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface DictDataMapper extends BaseMapper<DictData> {
+    String selectDictLabels(
+            String dictType,          // dict_type的变量
+            List<String> dictValues         // dict_value的变量（逗号分隔字符串）
+    ) ;
 }

hjzx-mapper/src/main/resources/mapper/patient/BlackListMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="api.mapper.patient.BlackListMapper">
+
+
+	<select id="existBlackByphone"     resultType="Long"  >
+		SELECT COUNT(1) FROM p_blacklist
+		<where>
+			is_delete = 0
+			<if test="phone != null  and phone != '' ">
+				and phone_number = #{phone}
+			</if>
+			AND (
+			(starttime &lt; NOW() AND endtime &gt; NOW())
+			OR (starttime IS NULL AND endtime IS NULL)
+			OR (starttime &lt; NOW() AND endtime IS NULL)
+			)
+		</where>
+
+	</select>
+
+
+
+
+
+
+
+
+
+
+</mapper> 

hjzx-mapper/src/main/resources/mapper/report/ReportMapper.xml

@@ -37,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="ldCount"     column="ldCount"      />
 		<result property="noAnswer"     column="noAnswer"      />
 		<result property="satisfied"     column="satisfied"      />
+		<result property="satisfactory"     column="satisfactory"      />
+
 		<result property="noSatisfied"     column="noSatisfied"      />
 	</resultMap>
 
@@ -230,7 +232,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		COUNT(1) ldCount,
 		SUM(CASE `is_answer` WHEN  1 THEN 1 ELSE 0  END ) answer,
 		SUM(CASE `is_answer` WHEN 0 THEN 1 ELSE 0  END ) noAnswer,
-		SUM(CASE WHEN `myd`>0  and `myd` <![CDATA[<]]> 3 THEN 1 ELSE 0  END ) satisfied,
+-- 		SUM(CASE WHEN `myd`>0  and `myd` <![CDATA[<]]> 3 THEN 1 ELSE 0  END ) satisfied,
+		SUM(CASE WHEN `myd`=1 THEN 1 ELSE 0  END ) satisfied,
+		SUM(CASE WHEN `myd`=2 THEN 1 ELSE 0  END ) satisfactory,
 		SUM(CASE WHEN `myd`=3 THEN 1 ELSE 0  END ) noSatisfied
 
 		FROM `rep_record` a

hjzx-mapper/src/main/resources/mapper/system/DictDataMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="api.mapper.system.DictDataMapper">
+
+
+    <select id="selectDictLabels" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(dict_label SEPARATOR ',')
+        FROM sys_dict_data
+        WHERE dict_type = #{dictType}  <!-- 直接引用变量 -->
+        AND dict_value IN
+        <foreach item="item" collection="dictValues" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+
+
+
+</mapper> 

hjzx-service/src/main/java/api/service/patient/IBlackListService.java

@@ -4,4 +4,5 @@ import api.entity.database.patient.BlackList;
 import api.service.IBaseService;
 
 public interface IBlackListService extends IBaseService<BlackList> {
+    Long  existBlackByphone(String phone);
 }

hjzx-service/src/main/java/api/service/patient/impl/BlackListServiceImpl.java

@@ -1,14 +1,23 @@
 package api.service.patient.impl;
 
 import api.entity.database.patient.BlackList;
+import api.mapper.order.WorkOrderBaseMapper;
 import api.mapper.patient.BlackListMapper;
 import api.service.patient.IBlackListService;
 import api.service.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.yaml.snakeyaml.LoaderOptions;
 
 @Transactional
 @Service
 public class BlackListServiceImpl extends BaseServiceImpl<BlackListMapper, BlackList> implements IBlackListService{
     public BlackListServiceImpl(){ super(false); }
+    @Autowired
+    private BlackListMapper blackListMapper;
+    @Override
+     public Long existBlackByphone(String phone) {
+          return blackListMapper.existBlackByphone(phone);
+    }
 }

hjzx-service/src/main/java/api/service/system/IDictDataService.java

@@ -3,5 +3,13 @@ package api.service.system;
 import api.entity.database.system.DictData;
 import api.service.IBaseService;
 
+import java.util.List;
+
 public interface IDictDataService extends IBaseService<DictData> {
+
+
+    String selectDictLabels(
+            String dictType,          // dict_type的变量
+            List<String> dictValues       // dict_value的变量（逗号分隔字符串）
+    );
 }

hjzx-service/src/main/java/api/service/system/impl/DictDataServiceImpl.java

@@ -2,13 +2,17 @@ package api.service.system.impl;
 
 
 import api.entity.database.system.DictData;
+import api.mapper.system.DeptMapper;
 import api.mapper.system.DictDataMapper;
 
 import api.service.BaseServiceImpl;
 import api.service.system.IDictDataService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Transactional
 @Service
 public class DictDataServiceImpl  extends BaseServiceImpl<DictDataMapper, DictData>   implements IDictDataService {
@@ -16,6 +20,15 @@ public class DictDataServiceImpl  extends BaseServiceImpl<DictDataMapper, DictDa
     public DictDataServiceImpl() {
         super(true);
     }
+    @Autowired
+    private DictDataMapper dictDataMapper;
+    @Override
+    public   String selectDictLabels(
+            String dictType,          // dict_type的变量
+            List<String> dictValues         // dict_value的变量（逗号分隔字符串）
+    ) {
+return  dictDataMapper.selectDictLabels(dictType,dictValues);
+    }
 }