Merge branch 'new' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java

@@ -501,6 +501,7 @@ public class ScreeningServiceImpl implements IScreeningService {
                     pmsPatient.setCurrentIllnessHistory(map.get("SCWJ-XBS-QT").getAnswer());
                 }
                 pmsPatient.setSource((byte) 0);
+                pmsPatient.setDelFlag((byte) 0);
                 pmsPatient.setUpdateTime(new Date());
                 pmsPatientMapper.updateByPrimaryKeySelective(pmsPatient);
             }

acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml

@@ -69,7 +69,7 @@
         <if test="query.name != null and query.name != ''">
             AND name = #{query.name}
         </if>
-        order by create_time desc
+        order by update_time desc
     </select>
 
     <select id="adminQuery" resultType="com.acupuncture.system.domain.vo.PmsTreatmentVo$TreatmentVO"