护理信息

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -175,6 +175,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/medicalCheckInnerExport").permitAll()
                 .antMatchers("/console/badLevelPage").permitAll()
                 .antMatchers("/console/export/badLevelPagePageExport").permitAll()
+                .antMatchers("/qc/medNurse/getMedNursePage").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -219,6 +219,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/medicalCheckInnerExport", request)
                 || matchers("/console/badLevelPage", request)
                 || matchers("/console/export/badLevelPagePageExport", request)
+                || matchers("/qc/medNurse/getMedNursePage", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -2041,8 +2041,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         pageMap.put("检查信息", null);
         // 医嘱信息
         pageMap.put("检验信息", null);
-        // 护理信息
-        pageMap.put("护理信息", null);
         // 知情同意书 = 【知情同意书】 + 【手术知情同意书】
         pageMap.put("知情同意书", recordDTOList);
         pageMap.put("谈话告知书", recordMap.get(54L));

src/main/java/com/diagbot/facade/MedNurseFacade.java

@@ -1,7 +1,15 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.entity.MedNurse;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.mapper.MedNurseMapper;
 import com.diagbot.service.impl.MedNurseServiceImpl;
-import com.diagbot.service.impl.StrConsultationNoteServiceImpl;
+import com.diagbot.vo.MedNurseInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -11,4 +19,34 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class MedNurseFacade extends MedNurseServiceImpl {
+    @Autowired
+    BehospitalInfoFacade behospitalInfoFacade;
+    @Autowired
+    MedNurseMapper medNurseMapper;
+
+    public  IPage<MedNurse> getMedNursePage(MedNurseInfoVO medNurseInfoVO){
+        // 添加住院病历信息
+       BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("behospital_code", medNurseInfoVO.getBehospitalCode())
+               .select("behospital_code","hospital_id","behospital_date","leave_hospital_date")
+        );
+        QueryWrapper<MedNurse> medNurseQueryWrapper = new QueryWrapper<>();
+        medNurseQueryWrapper.eq("behospital_code",medNurseInfoVO.getBehospitalCode());
+        medNurseQueryWrapper .eq("hospital_id",behospitalInfo.getHospitalId());
+        medNurseQueryWrapper .eq("is_deleted", IsDeleteEnum.N.getKey());
+        medNurseQueryWrapper .like("item_name", medNurseInfoVO.getItemName());
+        //测量时间
+        medNurseQueryWrapper.ge( "measure_time", medNurseInfoVO.getDateStart());
+        medNurseQueryWrapper.le( "measure_time", medNurseInfoVO.getDateEnd());
+        //出入院时间
+        medNurseQueryWrapper.ge( "measure_time", behospitalInfo.getBehospitalDate());
+        if(behospitalInfo.getLeaveHospitalDate() != null){
+            medNurseQueryWrapper.le( "measure_time",behospitalInfo.getLeaveHospitalDate());
+        }
+        Page<MedNurse> pageCase = new Page<MedNurse>(medNurseInfoVO.getCurrent(),medNurseInfoVO.getSize());
+        IPage<MedNurse> medNurseIPage = medNurseMapper.selectPage(pageCase, medNurseQueryWrapper);
+        return medNurseIPage;
+
+    }
 }

src/main/java/com/diagbot/vo/MedNurseInfoVO.java

@@ -0,0 +1,62 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/4 14:59
+ */
+@Getter
+@Setter
+public class MedNurseInfoVO extends Page {
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @NotBlank(message = "请输入病历号")
+    private String behospitalCode;
+
+    /**
+     * 体征名称
+     */
+    private String itemName;
+
+    /**
+     * 测量开始时间
+     */
+    private Date DateStart;
+
+    /**
+     * 入院时间
+     */
+    private Date behospitalDate;
+
+    /**
+     * 出院时间
+     */
+    private Date leaveHospitalDate;
+
+    /**
+     * 测量结束时间
+     */
+    private Date DateEnd;
+
+    /**
+     * 是否归档 (0-未归档 1-归档)
+     */
+    private String isPlacefile;
+
+}

src/main/java/com/diagbot/web/MedLisInfoController.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  */
 
 @RestController
-@RequestMapping("qc/medLisInfo")
+@RequestMapping("/qc/medLisInfo")
 @Api(value = "检验信息API", tags = { "检验信息API" })
 public class MedLisInfoController {
     @Autowired

src/main/java/com/diagbot/web/MedNurseController.java

@@ -1,20 +1,47 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedNurse;
+import com.diagbot.facade.MedNurseFacade;
+import com.diagbot.vo.MedNurseInfoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author cy
  * @since 2020-12-11
  */
-@Controller
-@RequestMapping("/medNurse")
+@RestController
+@RequestMapping("/qc/medNurse")
+@Api(value = "护理信息API", tags = {"护理信息API"})
 public class MedNurseController {
+    @Autowired
+    private MedNurseFacade medNurseFacade;
+
+    @ApiOperation(value = "护理信息API[by:cy]",
+            notes = "behospitalCode：病人住院序号<br>" +
+                    "itemName：体征名称（模糊搜索）<br>" +
+                    "DateStart：护理时间开始<br>" +
+                    "DateEnd：护理时间结束<br>;")
+    @PostMapping("/getMedNursePage")
+    @SysLogger("getMedNursePage")
+    public RespDTO<IPage<MedNurse>> getMedNursePage(@RequestBody @Valid MedNurseInfoVO medNurseInfoVO) {
+        return RespDTO.onSuc(medNurseFacade.getMedNursePage(medNurseInfoVO));
+    }
 
 }

src/main/java/com/diagbot/web/MedPacsInfoController.java

@@ -27,7 +27,7 @@ import javax.validation.Valid;
  * @since 2020-09-04
  */
 @RestController
-@RequestMapping("qc/medPacsInfo")
+@RequestMapping("/qc/medPacsInfo")
 @Api(value = "检查信息API", tags = {"检查信息API"})
 public class MedPacsInfoController {
     @Autowired