zhs
4 天以前 e0d63096c613106d3aa149ca80552a444ac820a0
06-27 zhs
已修改3个文件
11 ■■■■■ 文件已修改
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -564,6 +564,12 @@
    @Excel(name = " 出院病区名称 ")
    private String leavehospitaldistrictname;
    /**
     * 诊断名称
     */
    @Excel(name = "  离院诊断名称")
    @ApiModelProperty(value = "离院诊断名称")
    private String leavediagname;
    /**
     * 责任护士编码
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1352,7 +1352,11 @@
        PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
        PatMedInspection patMedInspection = new PatMedInspection();
        if(xiaoXiTou.get("XiaoXiLX").equals("JC_SQ_ShenQing") || xiaoXiTou.get("XiaoXiLX").equals("JC_SQ_XiuGai")){
        patMedInspection.setProjecttype(1);
        }else if(xiaoXiTou.get("XiaoXiLX").equals("JY_SQ_ShenQing") || xiaoXiTou.get("XiaoXiLX").equals("JY_SQ_XiuGai")){
            patMedInspection.setProjecttype(0);
        }
        patMedInspection.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
        patMedInspection.setInhospno(externalInHospPatientInfo.getBingAnHao());
        patMedInspection.setPatidHis(externalInHospPatientInfo.getBingRenID());
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -187,6 +187,7 @@
            <if test="leavehospitaldistrictname != null  and leavehospitaldistrictname != ''">and
                leavehospitaldistrictname = #{leavehospitaldistrictname}
            </if>
            <if test="leavediagname != null  and leavediagname != ''">and leavediagname like concat('%', #{leavediagname}, '%')</if>
            <if test="sex != null  and sex != ''">and sex = #{sex}</if>
            <if test="age != null ">and age = #{age}</if>
            <if test="patguid != null ">and patguid = #{patguid}</if>