1.销售端展示操作时间 2.小程序返回用户信息

fs-company/src/main/java/com/fs/company/controller/store/FsPrescribeController.java

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 处方Controller
@@ -63,6 +64,16 @@ public class FsPrescribeController extends BaseController
         fsPrescribe.setCompanyId(loginUser.getCompany().getCompanyId());
         List<FsPrescribeListVO> list = fsPrescribeService.selectFsPrescribeListVO(fsPrescribe);
         for (FsPrescribeListVO vo : list) {
+
+            if (vo.getOperateTime() != null) {
+                int totalSeconds = Integer.parseInt(vo.getOperateTime());
+                long minutes = TimeUnit.SECONDS.toMinutes(totalSeconds);
+                long seconds = totalSeconds - TimeUnit.MINUTES.toSeconds(minutes);
+                vo.setOperateTime(minutes + "分" + seconds + "秒");
+            } else {
+                vo.setOperateTime("-");
+            }
+
             if (vo.getPatientTel()!=null){
                 vo.setPatientTel(vo.getPatientTel().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
             }
@@ -78,6 +89,16 @@ public class FsPrescribeController extends BaseController
         fsPrescribe.setCompanyUserId(loginUser.getUser().getUserId());
         List<FsPrescribeListVO> list = fsPrescribeService.selectFsPrescribeListVO(fsPrescribe);
         for (FsPrescribeListVO vo : list) {
+
+            if (vo.getOperateTime() != null) {
+                int totalSeconds = Integer.parseInt(vo.getOperateTime());
+                long minutes = TimeUnit.SECONDS.toMinutes(totalSeconds);
+                long seconds = totalSeconds - TimeUnit.MINUTES.toSeconds(minutes);
+                vo.setOperateTime(minutes + "分" + seconds + "秒");
+            } else {
+                vo.setOperateTime("-");
+            }
+
             if (vo.getPatientTel()!=null){
                 vo.setPatientTel(vo.getPatientTel().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
             }

fs-service/src/main/java/com/fs/course/vo/FsUserInfoCollectionUVO.java

@@ -70,4 +70,11 @@ public class FsUserInfoCollectionUVO {
     private String allergy;
     //备注
     private String remark;
+
+    //用户性别 0女 1男
+    private Integer sex;
+    //用户姓名
+    private String userName;
+    //用户电话后四位
+    private String userPhoneFour;
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -563,6 +563,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             vo.setDoctor(doctorMapper.selectFsDoctorByDoctorId(collection.getDoctorId()));
             vo.setAllergy(collection.getAllergy());
             vo.setRemark(collection.getRemark());
+            vo.setSex(collection.getSex());
+            vo.setUserPhoneFour(collection.getUserPhoneFour());
+            vo.setUserName(collection.getUserName());
         }
         return vo;
     }